diff --git a/new-site/.hugo_build.lock b/.hugo_build.lock
similarity index 100%
rename from new-site/.hugo_build.lock
rename to .hugo_build.lock
diff --git a/new-site/archetypes/default.md b/archetypes/default.md
similarity index 100%
rename from new-site/archetypes/default.md
rename to archetypes/default.md
diff --git a/new-site/config.toml b/config.toml
similarity index 100%
rename from new-site/config.toml
rename to config.toml
diff --git a/new-site/content/_index.md b/content/_index.md
similarity index 100%
rename from new-site/content/_index.md
rename to content/_index.md
diff --git a/new-site/content/blog/meta-description-in-hugo.md b/content/blog/meta-description-in-hugo.md
similarity index 100%
rename from new-site/content/blog/meta-description-in-hugo.md
rename to content/blog/meta-description-in-hugo.md
diff --git a/new-site/content/blog/multiple-index-pages-in-hugo.md b/content/blog/multiple-index-pages-in-hugo.md
similarity index 100%
rename from new-site/content/blog/multiple-index-pages-in-hugo.md
rename to content/blog/multiple-index-pages-in-hugo.md
diff --git a/new-site/content/blog/pluralization-issues.md b/content/blog/pluralization-issues.md
similarity index 100%
rename from new-site/content/blog/pluralization-issues.md
rename to content/blog/pluralization-issues.md
diff --git a/new-site/content/blog/recover-lost-anki-streak.md b/content/blog/recover-lost-anki-streak.md
similarity index 100%
rename from new-site/content/blog/recover-lost-anki-streak.md
rename to content/blog/recover-lost-anki-streak.md
diff --git a/new-site/content/library/_index.md b/content/library/_index.md
similarity index 100%
rename from new-site/content/library/_index.md
rename to content/library/_index.md
diff --git a/new-site/content/library/bible/bitie.md b/content/library/bible/bitie.md
similarity index 100%
rename from new-site/content/library/bible/bitie.md
rename to content/library/bible/bitie.md
diff --git a/new-site/content/library/hackbook/00-00-HackbookEasyPeasy.md b/content/library/hackbook/00-00-HackbookEasyPeasy.md
similarity index 100%
rename from new-site/content/library/hackbook/00-00-HackbookEasyPeasy.md
rename to content/library/hackbook/00-00-HackbookEasyPeasy.md
diff --git a/new-site/content/library/hackbook/01-01-Preface.md b/content/library/hackbook/01-01-Preface.md
similarity index 100%
rename from new-site/content/library/hackbook/01-01-Preface.md
rename to content/library/hackbook/01-01-Preface.md
diff --git a/new-site/content/library/hackbook/01-02-Warning.md b/content/library/hackbook/01-02-Warning.md
similarity index 100%
rename from new-site/content/library/hackbook/01-02-Warning.md
rename to content/library/hackbook/01-02-Warning.md
diff --git a/new-site/content/library/hackbook/01-03-Fear.md b/content/library/hackbook/01-03-Fear.md
similarity index 100%
rename from new-site/content/library/hackbook/01-03-Fear.md
rename to content/library/hackbook/01-03-Fear.md
diff --git a/new-site/content/library/hackbook/02-01-Introduction.md b/content/library/hackbook/02-01-Introduction.md
similarity index 100%
rename from new-site/content/library/hackbook/02-01-Introduction.md
rename to content/library/hackbook/02-01-Introduction.md
diff --git a/new-site/content/library/hackbook/02-02-Sister-Kenny.md b/content/library/hackbook/02-02-Sister-Kenny.md
similarity index 100%
rename from new-site/content/library/hackbook/02-02-Sister-Kenny.md
rename to content/library/hackbook/02-02-Sister-Kenny.md
diff --git a/new-site/content/library/hackbook/03-01-The-Worst-PMO-Addict-I-Have-Yet-to-Meet.md b/content/library/hackbook/03-01-The-Worst-PMO-Addict-I-Have-Yet-to-Meet.md
similarity index 100%
rename from new-site/content/library/hackbook/03-01-The-Worst-PMO-Addict-I-Have-Yet-to-Meet.md
rename to content/library/hackbook/03-01-The-Worst-PMO-Addict-I-Have-Yet-to-Meet.md
diff --git a/new-site/content/library/hackbook/03-02-The-Easy-Method.md b/content/library/hackbook/03-02-The-Easy-Method.md
similarity index 100%
rename from new-site/content/library/hackbook/03-02-The-Easy-Method.md
rename to content/library/hackbook/03-02-The-Easy-Method.md
diff --git a/new-site/content/library/hackbook/03-03-Why-is-it-Difficult-to-Stop.md b/content/library/hackbook/03-03-Why-is-it-Difficult-to-Stop.md
similarity index 100%
rename from new-site/content/library/hackbook/03-03-Why-is-it-Difficult-to-Stop.md
rename to content/library/hackbook/03-03-Why-is-it-Difficult-to-Stop.md
diff --git a/new-site/content/library/hackbook/03-04-The-Sinister-Trap.md b/content/library/hackbook/03-04-The-Sinister-Trap.md
similarity index 100%
rename from new-site/content/library/hackbook/03-04-The-Sinister-Trap.md
rename to content/library/hackbook/03-04-The-Sinister-Trap.md
diff --git a/new-site/content/library/hackbook/03-05-Why-Do-We-Carry-On-With-PMO.md b/content/library/hackbook/03-05-Why-Do-We-Carry-On-With-PMO.md
similarity index 100%
rename from new-site/content/library/hackbook/03-05-Why-Do-We-Carry-On-With-PMO.md
rename to content/library/hackbook/03-05-Why-Do-We-Carry-On-With-PMO.md
diff --git a/new-site/content/library/hackbook/03-06-Internet-Porn.md b/content/library/hackbook/03-06-Internet-Porn.md
similarity index 100%
rename from new-site/content/library/hackbook/03-06-Internet-Porn.md
rename to content/library/hackbook/03-06-Internet-Porn.md
diff --git a/new-site/content/library/hackbook/03-07-Brainwashing-and-the-Primitive-Mechanism.md b/content/library/hackbook/03-07-Brainwashing-and-the-Primitive-Mechanism.md
similarity index 100%
rename from new-site/content/library/hackbook/03-07-Brainwashing-and-the-Primitive-Mechanism.md
rename to content/library/hackbook/03-07-Brainwashing-and-the-Primitive-Mechanism.md
diff --git a/new-site/content/library/hackbook/03-08-Relieving-Withdrawal-Pangs.md b/content/library/hackbook/03-08-Relieving-Withdrawal-Pangs.md
similarity index 100%
rename from new-site/content/library/hackbook/03-08-Relieving-Withdrawal-Pangs.md
rename to content/library/hackbook/03-08-Relieving-Withdrawal-Pangs.md
diff --git a/new-site/content/library/hackbook/03-09-Stress.md b/content/library/hackbook/03-09-Stress.md
similarity index 100%
rename from new-site/content/library/hackbook/03-09-Stress.md
rename to content/library/hackbook/03-09-Stress.md
diff --git a/new-site/content/library/hackbook/03-10-Boredom.md b/content/library/hackbook/03-10-Boredom.md
similarity index 100%
rename from new-site/content/library/hackbook/03-10-Boredom.md
rename to content/library/hackbook/03-10-Boredom.md
diff --git a/new-site/content/library/hackbook/03-11-Concentration.md b/content/library/hackbook/03-11-Concentration.md
similarity index 100%
rename from new-site/content/library/hackbook/03-11-Concentration.md
rename to content/library/hackbook/03-11-Concentration.md
diff --git a/new-site/content/library/hackbook/03-12-Relaxation.md b/content/library/hackbook/03-12-Relaxation.md
similarity index 100%
rename from new-site/content/library/hackbook/03-12-Relaxation.md
rename to content/library/hackbook/03-12-Relaxation.md
diff --git a/new-site/content/library/hackbook/03-13-Social-night-PMOing.md b/content/library/hackbook/03-13-Social-night-PMOing.md
similarity index 100%
rename from new-site/content/library/hackbook/03-13-Social-night-PMOing.md
rename to content/library/hackbook/03-13-Social-night-PMOing.md
diff --git a/new-site/content/library/hackbook/03-14-What-am-I-Giving-Up.md b/content/library/hackbook/03-14-What-am-I-Giving-Up.md
similarity index 100%
rename from new-site/content/library/hackbook/03-14-What-am-I-Giving-Up.md
rename to content/library/hackbook/03-14-What-am-I-Giving-Up.md
diff --git a/new-site/content/library/hackbook/03-15-Self-Imposed-Slavery.md b/content/library/hackbook/03-15-Self-Imposed-Slavery.md
similarity index 100%
rename from new-site/content/library/hackbook/03-15-Self-Imposed-Slavery.md
rename to content/library/hackbook/03-15-Self-Imposed-Slavery.md
diff --git a/new-site/content/library/hackbook/03-16-I-will-Save-X-Hours-A-Week.md b/content/library/hackbook/03-16-I-will-Save-X-Hours-A-Week.md
similarity index 100%
rename from new-site/content/library/hackbook/03-16-I-will-Save-X-Hours-A-Week.md
rename to content/library/hackbook/03-16-I-will-Save-X-Hours-A-Week.md
diff --git a/new-site/content/library/hackbook/03-17-Health.md b/content/library/hackbook/03-17-Health.md
similarity index 100%
rename from new-site/content/library/hackbook/03-17-Health.md
rename to content/library/hackbook/03-17-Health.md
diff --git a/new-site/content/library/hackbook/03-18-Energy.md b/content/library/hackbook/03-18-Energy.md
similarity index 100%
rename from new-site/content/library/hackbook/03-18-Energy.md
rename to content/library/hackbook/03-18-Energy.md
diff --git a/new-site/content/library/hackbook/03-19-It-Relaxes-Me-and-Gives-Me-Confidence.md b/content/library/hackbook/03-19-It-Relaxes-Me-and-Gives-Me-Confidence.md
similarity index 100%
rename from new-site/content/library/hackbook/03-19-It-Relaxes-Me-and-Gives-Me-Confidence.md
rename to content/library/hackbook/03-19-It-Relaxes-Me-and-Gives-Me-Confidence.md
diff --git a/new-site/content/library/hackbook/03-20-Those-Sinister-Black-Shadows.md b/content/library/hackbook/03-20-Those-Sinister-Black-Shadows.md
similarity index 100%
rename from new-site/content/library/hackbook/03-20-Those-Sinister-Black-Shadows.md
rename to content/library/hackbook/03-20-Those-Sinister-Black-Shadows.md
diff --git a/new-site/content/library/hackbook/03-21-The-Willpower-Method-of-Stopping.md b/content/library/hackbook/03-21-The-Willpower-Method-of-Stopping.md
similarity index 100%
rename from new-site/content/library/hackbook/03-21-The-Willpower-Method-of-Stopping.md
rename to content/library/hackbook/03-21-The-Willpower-Method-of-Stopping.md
diff --git a/new-site/content/library/hackbook/03-22-Beware-of-Cutting-Down.md b/content/library/hackbook/03-22-Beware-of-Cutting-Down.md
similarity index 100%
rename from new-site/content/library/hackbook/03-22-Beware-of-Cutting-Down.md
rename to content/library/hackbook/03-22-Beware-of-Cutting-Down.md
diff --git a/new-site/content/library/hackbook/03-23-Just-One-Peek.md b/content/library/hackbook/03-23-Just-One-Peek.md
similarity index 100%
rename from new-site/content/library/hackbook/03-23-Just-One-Peek.md
rename to content/library/hackbook/03-23-Just-One-Peek.md
diff --git a/new-site/content/library/hackbook/03-24-Casual-PMOers-Teenagers-Non-PMOers.md b/content/library/hackbook/03-24-Casual-PMOers-Teenagers-Non-PMOers.md
similarity index 100%
rename from new-site/content/library/hackbook/03-24-Casual-PMOers-Teenagers-Non-PMOers.md
rename to content/library/hackbook/03-24-Casual-PMOers-Teenagers-Non-PMOers.md
diff --git a/new-site/content/library/hackbook/03-25-The-YouTube-PMOer.md b/content/library/hackbook/03-25-The-YouTube-PMOer.md
similarity index 100%
rename from new-site/content/library/hackbook/03-25-The-YouTube-PMOer.md
rename to content/library/hackbook/03-25-The-YouTube-PMOer.md
diff --git a/new-site/content/library/hackbook/03-26-A-Social-Habit.md b/content/library/hackbook/03-26-A-Social-Habit.md
similarity index 100%
rename from new-site/content/library/hackbook/03-26-A-Social-Habit.md
rename to content/library/hackbook/03-26-A-Social-Habit.md
diff --git a/new-site/content/library/hackbook/03-27-Timing.md b/content/library/hackbook/03-27-Timing.md
similarity index 100%
rename from new-site/content/library/hackbook/03-27-Timing.md
rename to content/library/hackbook/03-27-Timing.md
diff --git a/new-site/content/library/hackbook/03-28-Will-I-Miss-The-Fun.md b/content/library/hackbook/03-28-Will-I-Miss-The-Fun.md
similarity index 100%
rename from new-site/content/library/hackbook/03-28-Will-I-Miss-The-Fun.md
rename to content/library/hackbook/03-28-Will-I-Miss-The-Fun.md
diff --git a/new-site/content/library/hackbook/03-29-Can-I-Compartmentalize.md b/content/library/hackbook/03-29-Can-I-Compartmentalize.md
similarity index 100%
rename from new-site/content/library/hackbook/03-29-Can-I-Compartmentalize.md
rename to content/library/hackbook/03-29-Can-I-Compartmentalize.md
diff --git a/new-site/content/library/hackbook/03-30-Avoid-False-Incentives.md b/content/library/hackbook/03-30-Avoid-False-Incentives.md
similarity index 100%
rename from new-site/content/library/hackbook/03-30-Avoid-False-Incentives.md
rename to content/library/hackbook/03-30-Avoid-False-Incentives.md
diff --git a/new-site/content/library/hackbook/03-31-The-Easy-Way-To-Stop.md b/content/library/hackbook/03-31-The-Easy-Way-To-Stop.md
similarity index 100%
rename from new-site/content/library/hackbook/03-31-The-Easy-Way-To-Stop.md
rename to content/library/hackbook/03-31-The-Easy-Way-To-Stop.md
diff --git a/new-site/content/library/hackbook/03-32-The-Withdrawal-Period.md b/content/library/hackbook/03-32-The-Withdrawal-Period.md
similarity index 100%
rename from new-site/content/library/hackbook/03-32-The-Withdrawal-Period.md
rename to content/library/hackbook/03-32-The-Withdrawal-Period.md
diff --git a/new-site/content/library/hackbook/03-33-Just-One-Peek.md b/content/library/hackbook/03-33-Just-One-Peek.md
similarity index 100%
rename from new-site/content/library/hackbook/03-33-Just-One-Peek.md
rename to content/library/hackbook/03-33-Just-One-Peek.md
diff --git a/new-site/content/library/hackbook/03-34-Will-It-Be-Harder-For-Me.md b/content/library/hackbook/03-34-Will-It-Be-Harder-For-Me.md
similarity index 100%
rename from new-site/content/library/hackbook/03-34-Will-It-Be-Harder-For-Me.md
rename to content/library/hackbook/03-34-Will-It-Be-Harder-For-Me.md
diff --git a/new-site/content/library/hackbook/03-35-The-Main-Reasons-For-Failure.md b/content/library/hackbook/03-35-The-Main-Reasons-For-Failure.md
similarity index 100%
rename from new-site/content/library/hackbook/03-35-The-Main-Reasons-For-Failure.md
rename to content/library/hackbook/03-35-The-Main-Reasons-For-Failure.md
diff --git a/new-site/content/library/hackbook/03-36-Substitutes.md b/content/library/hackbook/03-36-Substitutes.md
similarity index 100%
rename from new-site/content/library/hackbook/03-36-Substitutes.md
rename to content/library/hackbook/03-36-Substitutes.md
diff --git a/new-site/content/library/hackbook/03-37-Should-I-Avoid-Temptation-Situations.md b/content/library/hackbook/03-37-Should-I-Avoid-Temptation-Situations.md
similarity index 100%
rename from new-site/content/library/hackbook/03-37-Should-I-Avoid-Temptation-Situations.md
rename to content/library/hackbook/03-37-Should-I-Avoid-Temptation-Situations.md
diff --git a/new-site/content/library/hackbook/03-38-The-Moment-Of-Revelation.md b/content/library/hackbook/03-38-The-Moment-Of-Revelation.md
similarity index 100%
rename from new-site/content/library/hackbook/03-38-The-Moment-Of-Revelation.md
rename to content/library/hackbook/03-38-The-Moment-Of-Revelation.md
diff --git a/new-site/content/library/hackbook/03-39-The-Final-Visit.md b/content/library/hackbook/03-39-The-Final-Visit.md
similarity index 100%
rename from new-site/content/library/hackbook/03-39-The-Final-Visit.md
rename to content/library/hackbook/03-39-The-Final-Visit.md
diff --git a/new-site/content/library/hackbook/03-40-A-Final-Warning.md b/content/library/hackbook/03-40-A-Final-Warning.md
similarity index 100%
rename from new-site/content/library/hackbook/03-40-A-Final-Warning.md
rename to content/library/hackbook/03-40-A-Final-Warning.md
diff --git a/new-site/content/library/hackbook/03-41-Feedback.md b/content/library/hackbook/03-41-Feedback.md
similarity index 100%
rename from new-site/content/library/hackbook/03-41-Feedback.md
rename to content/library/hackbook/03-41-Feedback.md
diff --git a/new-site/content/library/hackbook/03-42-Help-The-PMOer-Left-On-The-Sinking-Ship.md b/content/library/hackbook/03-42-Help-The-PMOer-Left-On-The-Sinking-Ship.md
similarity index 100%
rename from new-site/content/library/hackbook/03-42-Help-The-PMOer-Left-On-The-Sinking-Ship.md
rename to content/library/hackbook/03-42-Help-The-PMOer-Left-On-The-Sinking-Ship.md
diff --git a/new-site/content/library/hackbook/03-43-Advice-To-Non-PMOers.md b/content/library/hackbook/03-43-Advice-To-Non-PMOers.md
similarity index 100%
rename from new-site/content/library/hackbook/03-43-Advice-To-Non-PMOers.md
rename to content/library/hackbook/03-43-Advice-To-Non-PMOers.md
diff --git a/new-site/content/library/hackbook/03-44-Should-I-Tell-My-SO.md b/content/library/hackbook/03-44-Should-I-Tell-My-SO.md
similarity index 100%
rename from new-site/content/library/hackbook/03-44-Should-I-Tell-My-SO.md
rename to content/library/hackbook/03-44-Should-I-Tell-My-SO.md
diff --git a/new-site/content/library/hackbook/04-01-The-Instructions.md b/content/library/hackbook/04-01-The-Instructions.md
similarity index 100%
rename from new-site/content/library/hackbook/04-01-The-Instructions.md
rename to content/library/hackbook/04-01-The-Instructions.md
diff --git a/new-site/content/library/hackbook/04-02-REBT-Coping-Statements.md b/content/library/hackbook/04-02-REBT-Coping-Statements.md
similarity index 100%
rename from new-site/content/library/hackbook/04-02-REBT-Coping-Statements.md
rename to content/library/hackbook/04-02-REBT-Coping-Statements.md
diff --git a/new-site/content/library/hackbook/05-01-Scripts-01.md b/content/library/hackbook/05-01-Scripts-01.md
similarity index 100%
rename from new-site/content/library/hackbook/05-01-Scripts-01.md
rename to content/library/hackbook/05-01-Scripts-01.md
diff --git a/new-site/content/library/hackbook/05-01-Scripts-02.md b/content/library/hackbook/05-01-Scripts-02.md
similarity index 100%
rename from new-site/content/library/hackbook/05-01-Scripts-02.md
rename to content/library/hackbook/05-01-Scripts-02.md
diff --git a/new-site/content/library/hackbook/05-01-Scripts-03.md b/content/library/hackbook/05-01-Scripts-03.md
similarity index 100%
rename from new-site/content/library/hackbook/05-01-Scripts-03.md
rename to content/library/hackbook/05-01-Scripts-03.md
diff --git a/new-site/content/library/hackbook/05-01-Scripts-04.md b/content/library/hackbook/05-01-Scripts-04.md
similarity index 100%
rename from new-site/content/library/hackbook/05-01-Scripts-04.md
rename to content/library/hackbook/05-01-Scripts-04.md
diff --git a/new-site/content/library/hackbook/05-01-Scripts-05.md b/content/library/hackbook/05-01-Scripts-05.md
similarity index 100%
rename from new-site/content/library/hackbook/05-01-Scripts-05.md
rename to content/library/hackbook/05-01-Scripts-05.md
diff --git a/new-site/content/library/hackbook/Fin.md b/content/library/hackbook/Fin.md
similarity index 100%
rename from new-site/content/library/hackbook/Fin.md
rename to content/library/hackbook/Fin.md
diff --git a/new-site/content/library/hackbook/_index.md b/content/library/hackbook/_index.md
similarity index 100%
rename from new-site/content/library/hackbook/_index.md
rename to content/library/hackbook/_index.md
diff --git a/new-site/content/library/ted-kaczynski/When-Non-Violence-is-Suicide.md b/content/library/ted-kaczynski/When-Non-Violence-is-Suicide.md
similarity index 100%
rename from new-site/content/library/ted-kaczynski/When-Non-Violence-is-Suicide.md
rename to content/library/ted-kaczynski/When-Non-Violence-is-Suicide.md
diff --git a/new-site/content/library/ted-kaczynski/Why_the_Technological_System_Will_Destroy_Itself.md b/content/library/ted-kaczynski/Why_the_Technological_System_Will_Destroy_Itself.md
similarity index 100%
rename from new-site/content/library/ted-kaczynski/Why_the_Technological_System_Will_Destroy_Itself.md
rename to content/library/ted-kaczynski/Why_the_Technological_System_Will_Destroy_Itself.md
diff --git a/new-site/content/library/ted-kaczynski/_index.md b/content/library/ted-kaczynski/_index.md
similarity index 100%
rename from new-site/content/library/ted-kaczynski/_index.md
rename to content/library/ted-kaczynski/_index.md
diff --git a/new-site/content/library/ted-kaczynski/ecofascism-an-aberrant-branch-of-leftism.md b/content/library/ted-kaczynski/ecofascism-an-aberrant-branch-of-leftism.md
similarity index 100%
rename from new-site/content/library/ted-kaczynski/ecofascism-an-aberrant-branch-of-leftism.md
rename to content/library/ted-kaczynski/ecofascism-an-aberrant-branch-of-leftism.md
diff --git a/new-site/content/library/ted-kaczynski/forward-to-technological-slavery.md b/content/library/ted-kaczynski/forward-to-technological-slavery.md
similarity index 100%
rename from new-site/content/library/ted-kaczynski/forward-to-technological-slavery.md
rename to content/library/ted-kaczynski/forward-to-technological-slavery.md
diff --git a/new-site/content/library/ted-kaczynski/hit-where-it-hurts.md b/content/library/ted-kaczynski/hit-where-it-hurts.md
similarity index 100%
rename from new-site/content/library/ted-kaczynski/hit-where-it-hurts.md
rename to content/library/ted-kaczynski/hit-where-it-hurts.md
diff --git a/new-site/content/library/ted-kaczynski/industrial-society-and-its-future.md b/content/library/ted-kaczynski/industrial-society-and-its-future.md
similarity index 100%
rename from new-site/content/library/ted-kaczynski/industrial-society-and-its-future.md
rename to content/library/ted-kaczynski/industrial-society-and-its-future.md
diff --git a/new-site/content/library/ted-kaczynski/morality-and-revolution.md b/content/library/ted-kaczynski/morality-and-revolution.md
similarity index 100%
rename from new-site/content/library/ted-kaczynski/morality-and-revolution.md
rename to content/library/ted-kaczynski/morality-and-revolution.md
diff --git a/new-site/content/library/ted-kaczynski/progress-vs-liberty.md b/content/library/ted-kaczynski/progress-vs-liberty.md
similarity index 100%
rename from new-site/content/library/ted-kaczynski/progress-vs-liberty.md
rename to content/library/ted-kaczynski/progress-vs-liberty.md
diff --git a/new-site/content/library/ted-kaczynski/ship-of-fools.md b/content/library/ted-kaczynski/ship-of-fools.md
similarity index 100%
rename from new-site/content/library/ted-kaczynski/ship-of-fools.md
rename to content/library/ted-kaczynski/ship-of-fools.md
diff --git a/new-site/content/library/ted-kaczynski/the-littering-ape.md b/content/library/ted-kaczynski/the-littering-ape.md
similarity index 100%
rename from new-site/content/library/ted-kaczynski/the-littering-ape.md
rename to content/library/ted-kaczynski/the-littering-ape.md
diff --git a/new-site/content/library/ted-kaczynski/the-long-term-outcome-of-geo-engineering.md b/content/library/ted-kaczynski/the-long-term-outcome-of-geo-engineering.md
similarity index 100%
rename from new-site/content/library/ted-kaczynski/the-long-term-outcome-of-geo-engineering.md
rename to content/library/ted-kaczynski/the-long-term-outcome-of-geo-engineering.md
diff --git a/new-site/content/library/ted-kaczynski/the-road-to-revolution.md b/content/library/ted-kaczynski/the-road-to-revolution.md
similarity index 100%
rename from new-site/content/library/ted-kaczynski/the-road-to-revolution.md
rename to content/library/ted-kaczynski/the-road-to-revolution.md
diff --git a/new-site/content/library/ted-kaczynski/the-system's-neatest-trick.md b/content/library/ted-kaczynski/the-system's-neatest-trick.md
similarity index 100%
rename from new-site/content/library/ted-kaczynski/the-system's-neatest-trick.md
rename to content/library/ted-kaczynski/the-system's-neatest-trick.md
diff --git a/new-site/content/library/ted-kaczynski/the-techie's-wet-dreams.md b/content/library/ted-kaczynski/the-techie's-wet-dreams.md
similarity index 100%
rename from new-site/content/library/ted-kaczynski/the-techie's-wet-dreams.md
rename to content/library/ted-kaczynski/the-techie's-wet-dreams.md
diff --git a/new-site/content/library/ted-kaczynski/the-truth-about-primitive-life-a-critique-of-anarchoprimitivism.md b/content/library/ted-kaczynski/the-truth-about-primitive-life-a-critique-of-anarchoprimitivism.md
similarity index 100%
rename from new-site/content/library/ted-kaczynski/the-truth-about-primitive-life-a-critique-of-anarchoprimitivism.md
rename to content/library/ted-kaczynski/the-truth-about-primitive-life-a-critique-of-anarchoprimitivism.md
diff --git a/new-site/content/tags/blog/_index.md b/content/tags/blog/_index.md
similarity index 100%
rename from new-site/content/tags/blog/_index.md
rename to content/tags/blog/_index.md
diff --git a/new-site/content/tags/hackbook/_index.md b/content/tags/hackbook/_index.md
similarity index 100%
rename from new-site/content/tags/hackbook/_index.md
rename to content/tags/hackbook/_index.md
diff --git a/new-site/content/tags/library/_index.md b/content/tags/library/_index.md
similarity index 100%
rename from new-site/content/tags/library/_index.md
rename to content/tags/library/_index.md
diff --git a/new-site/content/tags/updates/_index.md b/content/tags/updates/_index.md
similarity index 100%
rename from new-site/content/tags/updates/_index.md
rename to content/tags/updates/_index.md
diff --git a/new-site/content/updates/helloworld.md b/content/updates/helloworld.md
similarity index 100%
rename from new-site/content/updates/helloworld.md
rename to content/updates/helloworld.md
diff --git a/new-site/content/updates/updated-the-css-again.md b/content/updates/updated-the-css-again.md
similarity index 100%
rename from new-site/content/updates/updated-the-css-again.md
rename to content/updates/updated-the-css-again.md
diff --git a/new-site/content/updates/yoinked-css.md b/content/updates/yoinked-css.md
similarity index 100%
rename from new-site/content/updates/yoinked-css.md
rename to content/updates/yoinked-css.md
diff --git a/new-site/layouts/asd/_markup/render-heading.html b/layouts/asd/_markup/render-heading.html
similarity index 100%
rename from new-site/layouts/asd/_markup/render-heading.html
rename to layouts/asd/_markup/render-heading.html
diff --git a/new-site/layouts/asd/used_to_be.txt b/layouts/asd/used_to_be.txt
similarity index 100%
rename from new-site/layouts/asd/used_to_be.txt
rename to layouts/asd/used_to_be.txt
diff --git a/new-site/public/blog/first-entry/index.html b/public/blog/first-entry/index.html
similarity index 100%
rename from new-site/public/blog/first-entry/index.html
rename to public/blog/first-entry/index.html
diff --git a/new-site/public/blog/index.html b/public/blog/index.html
similarity index 100%
rename from new-site/public/blog/index.html
rename to public/blog/index.html
diff --git a/new-site/public/blog/index.xml b/public/blog/index.xml
similarity index 100%
rename from new-site/public/blog/index.xml
rename to public/blog/index.xml
diff --git a/new-site/public/blog/meta-description-in-hugo/index.html b/public/blog/meta-description-in-hugo/index.html
similarity index 100%
rename from new-site/public/blog/meta-description-in-hugo/index.html
rename to public/blog/meta-description-in-hugo/index.html
diff --git a/new-site/public/blog/multiple-index-pages-in-hugo/index.html b/public/blog/multiple-index-pages-in-hugo/index.html
similarity index 100%
rename from new-site/public/blog/multiple-index-pages-in-hugo/index.html
rename to public/blog/multiple-index-pages-in-hugo/index.html
diff --git a/new-site/public/blog/pluralization-issues/index.html b/public/blog/pluralization-issues/index.html
similarity index 100%
rename from new-site/public/blog/pluralization-issues/index.html
rename to public/blog/pluralization-issues/index.html
diff --git a/new-site/public/blog/recover-lost-anki-streak/index.html b/public/blog/recover-lost-anki-streak/index.html
similarity index 100%
rename from new-site/public/blog/recover-lost-anki-streak/index.html
rename to public/blog/recover-lost-anki-streak/index.html
diff --git a/new-site/public/blog/yoinked-css/index.html b/public/blog/yoinked-css/index.html
similarity index 100%
rename from new-site/public/blog/yoinked-css/index.html
rename to public/blog/yoinked-css/index.html
diff --git a/new-site/public/favicon.ico b/public/favicon.ico
similarity index 100%
rename from new-site/public/favicon.ico
rename to public/favicon.ico
diff --git a/new-site/public/former_style.css b/public/former_style.css
similarity index 100%
rename from new-site/public/former_style.css
rename to public/former_style.css
diff --git a/new-site/public/hackbook/00-00-hackbookeasypeasy/index.html b/public/hackbook/00-00-hackbookeasypeasy/index.html
similarity index 100%
rename from new-site/public/hackbook/00-00-hackbookeasypeasy/index.html
rename to public/hackbook/00-00-hackbookeasypeasy/index.html
diff --git a/new-site/public/hackbook/01-01-preface/index.html b/public/hackbook/01-01-preface/index.html
similarity index 100%
rename from new-site/public/hackbook/01-01-preface/index.html
rename to public/hackbook/01-01-preface/index.html
diff --git a/new-site/public/hackbook/01-02-warning/index.html b/public/hackbook/01-02-warning/index.html
similarity index 100%
rename from new-site/public/hackbook/01-02-warning/index.html
rename to public/hackbook/01-02-warning/index.html
diff --git a/new-site/public/hackbook/01-03-fear/index.html b/public/hackbook/01-03-fear/index.html
similarity index 100%
rename from new-site/public/hackbook/01-03-fear/index.html
rename to public/hackbook/01-03-fear/index.html
diff --git a/new-site/public/hackbook/02-01-introduction/index.html b/public/hackbook/02-01-introduction/index.html
similarity index 100%
rename from new-site/public/hackbook/02-01-introduction/index.html
rename to public/hackbook/02-01-introduction/index.html
diff --git a/new-site/public/hackbook/02-02-sister-kenny/index.html b/public/hackbook/02-02-sister-kenny/index.html
similarity index 100%
rename from new-site/public/hackbook/02-02-sister-kenny/index.html
rename to public/hackbook/02-02-sister-kenny/index.html
diff --git a/new-site/public/hackbook/03-01-the-worst-pmo-addict-i-have-yet-to-meet/index.html b/public/hackbook/03-01-the-worst-pmo-addict-i-have-yet-to-meet/index.html
similarity index 100%
rename from new-site/public/hackbook/03-01-the-worst-pmo-addict-i-have-yet-to-meet/index.html
rename to public/hackbook/03-01-the-worst-pmo-addict-i-have-yet-to-meet/index.html
diff --git a/new-site/public/hackbook/03-02-the-easy-method/index.html b/public/hackbook/03-02-the-easy-method/index.html
similarity index 100%
rename from new-site/public/hackbook/03-02-the-easy-method/index.html
rename to public/hackbook/03-02-the-easy-method/index.html
diff --git a/new-site/public/hackbook/03-03-why-is-it-difficult-to-stop/index.html b/public/hackbook/03-03-why-is-it-difficult-to-stop/index.html
similarity index 100%
rename from new-site/public/hackbook/03-03-why-is-it-difficult-to-stop/index.html
rename to public/hackbook/03-03-why-is-it-difficult-to-stop/index.html
diff --git a/new-site/public/hackbook/03-04-the-sinister-trap/index.html b/public/hackbook/03-04-the-sinister-trap/index.html
similarity index 100%
rename from new-site/public/hackbook/03-04-the-sinister-trap/index.html
rename to public/hackbook/03-04-the-sinister-trap/index.html
diff --git a/new-site/public/hackbook/03-05-why-do-we-carry-on-with-pmo/index.html b/public/hackbook/03-05-why-do-we-carry-on-with-pmo/index.html
similarity index 100%
rename from new-site/public/hackbook/03-05-why-do-we-carry-on-with-pmo/index.html
rename to public/hackbook/03-05-why-do-we-carry-on-with-pmo/index.html
diff --git a/new-site/public/hackbook/03-06-internet-porn/index.html b/public/hackbook/03-06-internet-porn/index.html
similarity index 100%
rename from new-site/public/hackbook/03-06-internet-porn/index.html
rename to public/hackbook/03-06-internet-porn/index.html
diff --git a/new-site/public/hackbook/03-07-brainwashing-and-the-primitive-mechanism/index.html b/public/hackbook/03-07-brainwashing-and-the-primitive-mechanism/index.html
similarity index 100%
rename from new-site/public/hackbook/03-07-brainwashing-and-the-primitive-mechanism/index.html
rename to public/hackbook/03-07-brainwashing-and-the-primitive-mechanism/index.html
diff --git a/new-site/public/hackbook/03-08-relieving-withdrawal-pangs/index.html b/public/hackbook/03-08-relieving-withdrawal-pangs/index.html
similarity index 100%
rename from new-site/public/hackbook/03-08-relieving-withdrawal-pangs/index.html
rename to public/hackbook/03-08-relieving-withdrawal-pangs/index.html
diff --git a/new-site/public/hackbook/03-09-stress/index.html b/public/hackbook/03-09-stress/index.html
similarity index 100%
rename from new-site/public/hackbook/03-09-stress/index.html
rename to public/hackbook/03-09-stress/index.html
diff --git a/new-site/public/hackbook/03-10-boredom/index.html b/public/hackbook/03-10-boredom/index.html
similarity index 100%
rename from new-site/public/hackbook/03-10-boredom/index.html
rename to public/hackbook/03-10-boredom/index.html
diff --git a/new-site/public/hackbook/03-11-concentration/index.html b/public/hackbook/03-11-concentration/index.html
similarity index 100%
rename from new-site/public/hackbook/03-11-concentration/index.html
rename to public/hackbook/03-11-concentration/index.html
diff --git a/new-site/public/hackbook/03-12-relaxation/index.html b/public/hackbook/03-12-relaxation/index.html
similarity index 100%
rename from new-site/public/hackbook/03-12-relaxation/index.html
rename to public/hackbook/03-12-relaxation/index.html
diff --git a/new-site/public/hackbook/03-13-social-night-pmoing/index.html b/public/hackbook/03-13-social-night-pmoing/index.html
similarity index 100%
rename from new-site/public/hackbook/03-13-social-night-pmoing/index.html
rename to public/hackbook/03-13-social-night-pmoing/index.html
diff --git a/new-site/public/hackbook/03-14-what-am-i-giving-up/index.html b/public/hackbook/03-14-what-am-i-giving-up/index.html
similarity index 100%
rename from new-site/public/hackbook/03-14-what-am-i-giving-up/index.html
rename to public/hackbook/03-14-what-am-i-giving-up/index.html
diff --git a/new-site/public/hackbook/03-15-self-imposed-slavery/index.html b/public/hackbook/03-15-self-imposed-slavery/index.html
similarity index 100%
rename from new-site/public/hackbook/03-15-self-imposed-slavery/index.html
rename to public/hackbook/03-15-self-imposed-slavery/index.html
diff --git a/new-site/public/hackbook/03-16-i-will-save-x-hours-a-week/index.html b/public/hackbook/03-16-i-will-save-x-hours-a-week/index.html
similarity index 100%
rename from new-site/public/hackbook/03-16-i-will-save-x-hours-a-week/index.html
rename to public/hackbook/03-16-i-will-save-x-hours-a-week/index.html
diff --git a/new-site/public/hackbook/03-17-health/index.html b/public/hackbook/03-17-health/index.html
similarity index 100%
rename from new-site/public/hackbook/03-17-health/index.html
rename to public/hackbook/03-17-health/index.html
diff --git a/new-site/public/hackbook/03-18-energy/index.html b/public/hackbook/03-18-energy/index.html
similarity index 100%
rename from new-site/public/hackbook/03-18-energy/index.html
rename to public/hackbook/03-18-energy/index.html
diff --git a/new-site/public/hackbook/03-19-it-relaxes-me-and-gives-me-confidence/index.html b/public/hackbook/03-19-it-relaxes-me-and-gives-me-confidence/index.html
similarity index 100%
rename from new-site/public/hackbook/03-19-it-relaxes-me-and-gives-me-confidence/index.html
rename to public/hackbook/03-19-it-relaxes-me-and-gives-me-confidence/index.html
diff --git a/new-site/public/hackbook/03-20-those-sinister-black-shadows/index.html b/public/hackbook/03-20-those-sinister-black-shadows/index.html
similarity index 100%
rename from new-site/public/hackbook/03-20-those-sinister-black-shadows/index.html
rename to public/hackbook/03-20-those-sinister-black-shadows/index.html
diff --git a/new-site/public/hackbook/03-21-the-willpower-method-of-stopping/index.html b/public/hackbook/03-21-the-willpower-method-of-stopping/index.html
similarity index 100%
rename from new-site/public/hackbook/03-21-the-willpower-method-of-stopping/index.html
rename to public/hackbook/03-21-the-willpower-method-of-stopping/index.html
diff --git a/new-site/public/hackbook/03-22-beware-of-cutting-down/index.html b/public/hackbook/03-22-beware-of-cutting-down/index.html
similarity index 100%
rename from new-site/public/hackbook/03-22-beware-of-cutting-down/index.html
rename to public/hackbook/03-22-beware-of-cutting-down/index.html
diff --git a/new-site/public/hackbook/03-23-just-one-peek/index.html b/public/hackbook/03-23-just-one-peek/index.html
similarity index 100%
rename from new-site/public/hackbook/03-23-just-one-peek/index.html
rename to public/hackbook/03-23-just-one-peek/index.html
diff --git a/new-site/public/hackbook/03-24-casual-pmoers-teenagers-non-pmoers/index.html b/public/hackbook/03-24-casual-pmoers-teenagers-non-pmoers/index.html
similarity index 100%
rename from new-site/public/hackbook/03-24-casual-pmoers-teenagers-non-pmoers/index.html
rename to public/hackbook/03-24-casual-pmoers-teenagers-non-pmoers/index.html
diff --git a/new-site/public/hackbook/03-25-the-youtube-pmoer/index.html b/public/hackbook/03-25-the-youtube-pmoer/index.html
similarity index 100%
rename from new-site/public/hackbook/03-25-the-youtube-pmoer/index.html
rename to public/hackbook/03-25-the-youtube-pmoer/index.html
diff --git a/new-site/public/hackbook/03-26-a-social-habit/index.html b/public/hackbook/03-26-a-social-habit/index.html
similarity index 100%
rename from new-site/public/hackbook/03-26-a-social-habit/index.html
rename to public/hackbook/03-26-a-social-habit/index.html
diff --git a/new-site/public/hackbook/03-27-timing/index.html b/public/hackbook/03-27-timing/index.html
similarity index 100%
rename from new-site/public/hackbook/03-27-timing/index.html
rename to public/hackbook/03-27-timing/index.html
diff --git a/new-site/public/hackbook/03-28-will-i-miss-the-fun/index.html b/public/hackbook/03-28-will-i-miss-the-fun/index.html
similarity index 100%
rename from new-site/public/hackbook/03-28-will-i-miss-the-fun/index.html
rename to public/hackbook/03-28-will-i-miss-the-fun/index.html
diff --git a/new-site/public/hackbook/03-29-can-i-compartmentalize/index.html b/public/hackbook/03-29-can-i-compartmentalize/index.html
similarity index 100%
rename from new-site/public/hackbook/03-29-can-i-compartmentalize/index.html
rename to public/hackbook/03-29-can-i-compartmentalize/index.html
diff --git a/new-site/public/hackbook/03-30-avoid-false-incentives/index.html b/public/hackbook/03-30-avoid-false-incentives/index.html
similarity index 100%
rename from new-site/public/hackbook/03-30-avoid-false-incentives/index.html
rename to public/hackbook/03-30-avoid-false-incentives/index.html
diff --git a/new-site/public/hackbook/03-31-the-easy-way-to-stop/index.html b/public/hackbook/03-31-the-easy-way-to-stop/index.html
similarity index 100%
rename from new-site/public/hackbook/03-31-the-easy-way-to-stop/index.html
rename to public/hackbook/03-31-the-easy-way-to-stop/index.html
diff --git a/new-site/public/hackbook/03-32-the-withdrawal-period/index.html b/public/hackbook/03-32-the-withdrawal-period/index.html
similarity index 100%
rename from new-site/public/hackbook/03-32-the-withdrawal-period/index.html
rename to public/hackbook/03-32-the-withdrawal-period/index.html
diff --git a/new-site/public/hackbook/03-33-just-one-peek/index.html b/public/hackbook/03-33-just-one-peek/index.html
similarity index 100%
rename from new-site/public/hackbook/03-33-just-one-peek/index.html
rename to public/hackbook/03-33-just-one-peek/index.html
diff --git a/new-site/public/hackbook/03-34-will-it-be-harder-for-me/index.html b/public/hackbook/03-34-will-it-be-harder-for-me/index.html
similarity index 100%
rename from new-site/public/hackbook/03-34-will-it-be-harder-for-me/index.html
rename to public/hackbook/03-34-will-it-be-harder-for-me/index.html
diff --git a/new-site/public/hackbook/03-35-the-main-reasons-for-failure/index.html b/public/hackbook/03-35-the-main-reasons-for-failure/index.html
similarity index 100%
rename from new-site/public/hackbook/03-35-the-main-reasons-for-failure/index.html
rename to public/hackbook/03-35-the-main-reasons-for-failure/index.html
diff --git a/new-site/public/hackbook/03-36-substitutes/index.html b/public/hackbook/03-36-substitutes/index.html
similarity index 100%
rename from new-site/public/hackbook/03-36-substitutes/index.html
rename to public/hackbook/03-36-substitutes/index.html
diff --git a/new-site/public/hackbook/03-37-should-i-avoid-temptation-situations/index.html b/public/hackbook/03-37-should-i-avoid-temptation-situations/index.html
similarity index 100%
rename from new-site/public/hackbook/03-37-should-i-avoid-temptation-situations/index.html
rename to public/hackbook/03-37-should-i-avoid-temptation-situations/index.html
diff --git a/new-site/public/hackbook/03-38-the-moment-of-revelation/index.html b/public/hackbook/03-38-the-moment-of-revelation/index.html
similarity index 100%
rename from new-site/public/hackbook/03-38-the-moment-of-revelation/index.html
rename to public/hackbook/03-38-the-moment-of-revelation/index.html
diff --git a/new-site/public/hackbook/03-39-the-final-visit/index.html b/public/hackbook/03-39-the-final-visit/index.html
similarity index 100%
rename from new-site/public/hackbook/03-39-the-final-visit/index.html
rename to public/hackbook/03-39-the-final-visit/index.html
diff --git a/new-site/public/hackbook/03-40-a-final-warning/index.html b/public/hackbook/03-40-a-final-warning/index.html
similarity index 100%
rename from new-site/public/hackbook/03-40-a-final-warning/index.html
rename to public/hackbook/03-40-a-final-warning/index.html
diff --git a/new-site/public/hackbook/03-41-feedback/index.html b/public/hackbook/03-41-feedback/index.html
similarity index 100%
rename from new-site/public/hackbook/03-41-feedback/index.html
rename to public/hackbook/03-41-feedback/index.html
diff --git a/new-site/public/hackbook/03-42-help-the-pmoer-left-on-the-sinking-ship/index.html b/public/hackbook/03-42-help-the-pmoer-left-on-the-sinking-ship/index.html
similarity index 100%
rename from new-site/public/hackbook/03-42-help-the-pmoer-left-on-the-sinking-ship/index.html
rename to public/hackbook/03-42-help-the-pmoer-left-on-the-sinking-ship/index.html
diff --git a/new-site/public/hackbook/03-43-advice-to-non-pmoers/index.html b/public/hackbook/03-43-advice-to-non-pmoers/index.html
similarity index 100%
rename from new-site/public/hackbook/03-43-advice-to-non-pmoers/index.html
rename to public/hackbook/03-43-advice-to-non-pmoers/index.html
diff --git a/new-site/public/hackbook/03-44-should-i-tell-my-so/index.html b/public/hackbook/03-44-should-i-tell-my-so/index.html
similarity index 100%
rename from new-site/public/hackbook/03-44-should-i-tell-my-so/index.html
rename to public/hackbook/03-44-should-i-tell-my-so/index.html
diff --git a/new-site/public/hackbook/04-01-the-instructions/index.html b/public/hackbook/04-01-the-instructions/index.html
similarity index 100%
rename from new-site/public/hackbook/04-01-the-instructions/index.html
rename to public/hackbook/04-01-the-instructions/index.html
diff --git a/new-site/public/hackbook/04-02-rebt-coping-statements/index.html b/public/hackbook/04-02-rebt-coping-statements/index.html
similarity index 100%
rename from new-site/public/hackbook/04-02-rebt-coping-statements/index.html
rename to public/hackbook/04-02-rebt-coping-statements/index.html
diff --git a/new-site/public/hackbook/05-01-scripts-01/index.html b/public/hackbook/05-01-scripts-01/index.html
similarity index 100%
rename from new-site/public/hackbook/05-01-scripts-01/index.html
rename to public/hackbook/05-01-scripts-01/index.html
diff --git a/new-site/public/hackbook/05-01-scripts-02/index.html b/public/hackbook/05-01-scripts-02/index.html
similarity index 100%
rename from new-site/public/hackbook/05-01-scripts-02/index.html
rename to public/hackbook/05-01-scripts-02/index.html
diff --git a/new-site/public/hackbook/05-01-scripts-03/index.html b/public/hackbook/05-01-scripts-03/index.html
similarity index 100%
rename from new-site/public/hackbook/05-01-scripts-03/index.html
rename to public/hackbook/05-01-scripts-03/index.html
diff --git a/new-site/public/hackbook/05-01-scripts-04/index.html b/public/hackbook/05-01-scripts-04/index.html
similarity index 100%
rename from new-site/public/hackbook/05-01-scripts-04/index.html
rename to public/hackbook/05-01-scripts-04/index.html
diff --git a/new-site/public/hackbook/05-01-scripts-05/index.html b/public/hackbook/05-01-scripts-05/index.html
similarity index 100%
rename from new-site/public/hackbook/05-01-scripts-05/index.html
rename to public/hackbook/05-01-scripts-05/index.html
diff --git a/new-site/public/hackbook/fin/index.html b/public/hackbook/fin/index.html
similarity index 100%
rename from new-site/public/hackbook/fin/index.html
rename to public/hackbook/fin/index.html
diff --git a/new-site/public/hackbook/hackbook.pdf b/public/hackbook/hackbook.pdf
similarity index 100%
rename from new-site/public/hackbook/hackbook.pdf
rename to public/hackbook/hackbook.pdf
diff --git a/new-site/public/hackbook/index.html b/public/hackbook/index.html
similarity index 100%
rename from new-site/public/hackbook/index.html
rename to public/hackbook/index.html
diff --git a/new-site/public/hackbook/index.xml b/public/hackbook/index.xml
similarity index 100%
rename from new-site/public/hackbook/index.xml
rename to public/hackbook/index.xml
diff --git a/new-site/public/helloworld/index.html b/public/helloworld/index.html
similarity index 100%
rename from new-site/public/helloworld/index.html
rename to public/helloworld/index.html
diff --git a/new-site/public/img/ab67706c0000da8432f03af2b48b93d104186742.jpg b/public/img/ab67706c0000da8432f03af2b48b93d104186742.jpg
similarity index 100%
rename from new-site/public/img/ab67706c0000da8432f03af2b48b93d104186742.jpg
rename to public/img/ab67706c0000da8432f03af2b48b93d104186742.jpg
diff --git a/new-site/public/img/blinky.gif b/public/img/blinky.gif
similarity index 100%
rename from new-site/public/img/blinky.gif
rename to public/img/blinky.gif
diff --git a/new-site/public/img/burst-updated.gif b/public/img/burst-updated.gif
similarity index 100%
rename from new-site/public/img/burst-updated.gif
rename to public/img/burst-updated.gif
diff --git a/new-site/public/img/construction.gif b/public/img/construction.gif
similarity index 100%
rename from new-site/public/img/construction.gif
rename to public/img/construction.gif
diff --git a/new-site/public/img/construction2.gif b/public/img/construction2.gif
similarity index 100%
rename from new-site/public/img/construction2.gif
rename to public/img/construction2.gif
diff --git a/new-site/public/img/custom-index-directory.PNG b/public/img/custom-index-directory.PNG
similarity index 100%
rename from new-site/public/img/custom-index-directory.PNG
rename to public/img/custom-index-directory.PNG
diff --git a/new-site/public/img/gigachad_orthodox.jpg b/public/img/gigachad_orthodox.jpg
similarity index 100%
rename from new-site/public/img/gigachad_orthodox.jpg
rename to public/img/gigachad_orthodox.jpg
diff --git a/new-site/public/img/layout-custom-index.PNG b/public/img/layout-custom-index.PNG
similarity index 100%
rename from new-site/public/img/layout-custom-index.PNG
rename to public/img/layout-custom-index.PNG
diff --git a/new-site/public/img/new_turning.gif b/public/img/new_turning.gif
similarity index 100%
rename from new-site/public/img/new_turning.gif
rename to public/img/new_turning.gif
diff --git a/new-site/public/img/oops.gif b/public/img/oops.gif
similarity index 100%
rename from new-site/public/img/oops.gif
rename to public/img/oops.gif
diff --git a/new-site/public/img/wip.gif b/public/img/wip.gif
similarity index 100%
rename from new-site/public/img/wip.gif
rename to public/img/wip.gif
diff --git a/new-site/public/index.html b/public/index.html
similarity index 100%
rename from new-site/public/index.html
rename to public/index.html
diff --git a/new-site/public/index.xml b/public/index.xml
similarity index 100%
rename from new-site/public/index.xml
rename to public/index.xml
diff --git a/new-site/public/library/hackbook/00-00-hackbookeasypeasy/index.html b/public/library/hackbook/00-00-hackbookeasypeasy/index.html
similarity index 100%
rename from new-site/public/library/hackbook/00-00-hackbookeasypeasy/index.html
rename to public/library/hackbook/00-00-hackbookeasypeasy/index.html
diff --git a/new-site/public/library/hackbook/01-01-preface/index.html b/public/library/hackbook/01-01-preface/index.html
similarity index 100%
rename from new-site/public/library/hackbook/01-01-preface/index.html
rename to public/library/hackbook/01-01-preface/index.html
diff --git a/new-site/public/library/hackbook/01-02-warning/index.html b/public/library/hackbook/01-02-warning/index.html
similarity index 100%
rename from new-site/public/library/hackbook/01-02-warning/index.html
rename to public/library/hackbook/01-02-warning/index.html
diff --git a/new-site/public/library/hackbook/01-03-fear/index.html b/public/library/hackbook/01-03-fear/index.html
similarity index 100%
rename from new-site/public/library/hackbook/01-03-fear/index.html
rename to public/library/hackbook/01-03-fear/index.html
diff --git a/new-site/public/library/hackbook/02-01-introduction/index.html b/public/library/hackbook/02-01-introduction/index.html
similarity index 100%
rename from new-site/public/library/hackbook/02-01-introduction/index.html
rename to public/library/hackbook/02-01-introduction/index.html
diff --git a/new-site/public/library/hackbook/02-02-sister-kenny/index.html b/public/library/hackbook/02-02-sister-kenny/index.html
similarity index 100%
rename from new-site/public/library/hackbook/02-02-sister-kenny/index.html
rename to public/library/hackbook/02-02-sister-kenny/index.html
diff --git a/new-site/public/library/hackbook/03-01-the-worst-pmo-addict-i-have-yet-to-meet/index.html b/public/library/hackbook/03-01-the-worst-pmo-addict-i-have-yet-to-meet/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-01-the-worst-pmo-addict-i-have-yet-to-meet/index.html
rename to public/library/hackbook/03-01-the-worst-pmo-addict-i-have-yet-to-meet/index.html
diff --git a/new-site/public/library/hackbook/03-02-the-easy-method/index.html b/public/library/hackbook/03-02-the-easy-method/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-02-the-easy-method/index.html
rename to public/library/hackbook/03-02-the-easy-method/index.html
diff --git a/new-site/public/library/hackbook/03-03-why-is-it-difficult-to-stop/index.html b/public/library/hackbook/03-03-why-is-it-difficult-to-stop/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-03-why-is-it-difficult-to-stop/index.html
rename to public/library/hackbook/03-03-why-is-it-difficult-to-stop/index.html
diff --git a/new-site/public/library/hackbook/03-04-the-sinister-trap/index.html b/public/library/hackbook/03-04-the-sinister-trap/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-04-the-sinister-trap/index.html
rename to public/library/hackbook/03-04-the-sinister-trap/index.html
diff --git a/new-site/public/library/hackbook/03-05-why-do-we-carry-on-with-pmo/index.html b/public/library/hackbook/03-05-why-do-we-carry-on-with-pmo/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-05-why-do-we-carry-on-with-pmo/index.html
rename to public/library/hackbook/03-05-why-do-we-carry-on-with-pmo/index.html
diff --git a/new-site/public/library/hackbook/03-06-internet-porn/index.html b/public/library/hackbook/03-06-internet-porn/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-06-internet-porn/index.html
rename to public/library/hackbook/03-06-internet-porn/index.html
diff --git a/new-site/public/library/hackbook/03-07-brainwashing-and-the-primitive-mechanism/index.html b/public/library/hackbook/03-07-brainwashing-and-the-primitive-mechanism/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-07-brainwashing-and-the-primitive-mechanism/index.html
rename to public/library/hackbook/03-07-brainwashing-and-the-primitive-mechanism/index.html
diff --git a/new-site/public/library/hackbook/03-08-relieving-withdrawal-pangs/index.html b/public/library/hackbook/03-08-relieving-withdrawal-pangs/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-08-relieving-withdrawal-pangs/index.html
rename to public/library/hackbook/03-08-relieving-withdrawal-pangs/index.html
diff --git a/new-site/public/library/hackbook/03-09-stress/index.html b/public/library/hackbook/03-09-stress/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-09-stress/index.html
rename to public/library/hackbook/03-09-stress/index.html
diff --git a/new-site/public/library/hackbook/03-10-boredom/index.html b/public/library/hackbook/03-10-boredom/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-10-boredom/index.html
rename to public/library/hackbook/03-10-boredom/index.html
diff --git a/new-site/public/library/hackbook/03-11-concentration/index.html b/public/library/hackbook/03-11-concentration/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-11-concentration/index.html
rename to public/library/hackbook/03-11-concentration/index.html
diff --git a/new-site/public/library/hackbook/03-12-relaxation/index.html b/public/library/hackbook/03-12-relaxation/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-12-relaxation/index.html
rename to public/library/hackbook/03-12-relaxation/index.html
diff --git a/new-site/public/library/hackbook/03-13-social-night-pmoing/index.html b/public/library/hackbook/03-13-social-night-pmoing/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-13-social-night-pmoing/index.html
rename to public/library/hackbook/03-13-social-night-pmoing/index.html
diff --git a/new-site/public/library/hackbook/03-14-what-am-i-giving-up/index.html b/public/library/hackbook/03-14-what-am-i-giving-up/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-14-what-am-i-giving-up/index.html
rename to public/library/hackbook/03-14-what-am-i-giving-up/index.html
diff --git a/new-site/public/library/hackbook/03-15-self-imposed-slavery/index.html b/public/library/hackbook/03-15-self-imposed-slavery/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-15-self-imposed-slavery/index.html
rename to public/library/hackbook/03-15-self-imposed-slavery/index.html
diff --git a/new-site/public/library/hackbook/03-16-i-will-save-x-hours-a-week/index.html b/public/library/hackbook/03-16-i-will-save-x-hours-a-week/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-16-i-will-save-x-hours-a-week/index.html
rename to public/library/hackbook/03-16-i-will-save-x-hours-a-week/index.html
diff --git a/new-site/public/library/hackbook/03-17-health/index.html b/public/library/hackbook/03-17-health/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-17-health/index.html
rename to public/library/hackbook/03-17-health/index.html
diff --git a/new-site/public/library/hackbook/03-18-energy/index.html b/public/library/hackbook/03-18-energy/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-18-energy/index.html
rename to public/library/hackbook/03-18-energy/index.html
diff --git a/new-site/public/library/hackbook/03-19-it-relaxes-me-and-gives-me-confidence/index.html b/public/library/hackbook/03-19-it-relaxes-me-and-gives-me-confidence/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-19-it-relaxes-me-and-gives-me-confidence/index.html
rename to public/library/hackbook/03-19-it-relaxes-me-and-gives-me-confidence/index.html
diff --git a/new-site/public/library/hackbook/03-20-those-sinister-black-shadows/index.html b/public/library/hackbook/03-20-those-sinister-black-shadows/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-20-those-sinister-black-shadows/index.html
rename to public/library/hackbook/03-20-those-sinister-black-shadows/index.html
diff --git a/new-site/public/library/hackbook/03-21-the-willpower-method-of-stopping/index.html b/public/library/hackbook/03-21-the-willpower-method-of-stopping/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-21-the-willpower-method-of-stopping/index.html
rename to public/library/hackbook/03-21-the-willpower-method-of-stopping/index.html
diff --git a/new-site/public/library/hackbook/03-22-beware-of-cutting-down/index.html b/public/library/hackbook/03-22-beware-of-cutting-down/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-22-beware-of-cutting-down/index.html
rename to public/library/hackbook/03-22-beware-of-cutting-down/index.html
diff --git a/new-site/public/library/hackbook/03-23-just-one-peek/index.html b/public/library/hackbook/03-23-just-one-peek/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-23-just-one-peek/index.html
rename to public/library/hackbook/03-23-just-one-peek/index.html
diff --git a/new-site/public/library/hackbook/03-24-casual-pmoers-teenagers-non-pmoers/index.html b/public/library/hackbook/03-24-casual-pmoers-teenagers-non-pmoers/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-24-casual-pmoers-teenagers-non-pmoers/index.html
rename to public/library/hackbook/03-24-casual-pmoers-teenagers-non-pmoers/index.html
diff --git a/new-site/public/library/hackbook/03-25-the-youtube-pmoer/index.html b/public/library/hackbook/03-25-the-youtube-pmoer/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-25-the-youtube-pmoer/index.html
rename to public/library/hackbook/03-25-the-youtube-pmoer/index.html
diff --git a/new-site/public/library/hackbook/03-26-a-social-habit/index.html b/public/library/hackbook/03-26-a-social-habit/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-26-a-social-habit/index.html
rename to public/library/hackbook/03-26-a-social-habit/index.html
diff --git a/new-site/public/library/hackbook/03-27-timing/index.html b/public/library/hackbook/03-27-timing/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-27-timing/index.html
rename to public/library/hackbook/03-27-timing/index.html
diff --git a/new-site/public/library/hackbook/03-28-will-i-miss-the-fun/index.html b/public/library/hackbook/03-28-will-i-miss-the-fun/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-28-will-i-miss-the-fun/index.html
rename to public/library/hackbook/03-28-will-i-miss-the-fun/index.html
diff --git a/new-site/public/library/hackbook/03-29-can-i-compartmentalize/index.html b/public/library/hackbook/03-29-can-i-compartmentalize/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-29-can-i-compartmentalize/index.html
rename to public/library/hackbook/03-29-can-i-compartmentalize/index.html
diff --git a/new-site/public/library/hackbook/03-30-avoid-false-incentives/index.html b/public/library/hackbook/03-30-avoid-false-incentives/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-30-avoid-false-incentives/index.html
rename to public/library/hackbook/03-30-avoid-false-incentives/index.html
diff --git a/new-site/public/library/hackbook/03-31-the-easy-way-to-stop/index.html b/public/library/hackbook/03-31-the-easy-way-to-stop/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-31-the-easy-way-to-stop/index.html
rename to public/library/hackbook/03-31-the-easy-way-to-stop/index.html
diff --git a/new-site/public/library/hackbook/03-32-the-withdrawal-period/index.html b/public/library/hackbook/03-32-the-withdrawal-period/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-32-the-withdrawal-period/index.html
rename to public/library/hackbook/03-32-the-withdrawal-period/index.html
diff --git a/new-site/public/library/hackbook/03-33-just-one-peek/index.html b/public/library/hackbook/03-33-just-one-peek/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-33-just-one-peek/index.html
rename to public/library/hackbook/03-33-just-one-peek/index.html
diff --git a/new-site/public/library/hackbook/03-34-will-it-be-harder-for-me/index.html b/public/library/hackbook/03-34-will-it-be-harder-for-me/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-34-will-it-be-harder-for-me/index.html
rename to public/library/hackbook/03-34-will-it-be-harder-for-me/index.html
diff --git a/new-site/public/library/hackbook/03-35-the-main-reasons-for-failure/index.html b/public/library/hackbook/03-35-the-main-reasons-for-failure/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-35-the-main-reasons-for-failure/index.html
rename to public/library/hackbook/03-35-the-main-reasons-for-failure/index.html
diff --git a/new-site/public/library/hackbook/03-36-substitutes/index.html b/public/library/hackbook/03-36-substitutes/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-36-substitutes/index.html
rename to public/library/hackbook/03-36-substitutes/index.html
diff --git a/new-site/public/library/hackbook/03-37-should-i-avoid-temptation-situations/index.html b/public/library/hackbook/03-37-should-i-avoid-temptation-situations/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-37-should-i-avoid-temptation-situations/index.html
rename to public/library/hackbook/03-37-should-i-avoid-temptation-situations/index.html
diff --git a/new-site/public/library/hackbook/03-38-the-moment-of-revelation/index.html b/public/library/hackbook/03-38-the-moment-of-revelation/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-38-the-moment-of-revelation/index.html
rename to public/library/hackbook/03-38-the-moment-of-revelation/index.html
diff --git a/new-site/public/library/hackbook/03-39-the-final-visit/index.html b/public/library/hackbook/03-39-the-final-visit/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-39-the-final-visit/index.html
rename to public/library/hackbook/03-39-the-final-visit/index.html
diff --git a/new-site/public/library/hackbook/03-40-a-final-warning/index.html b/public/library/hackbook/03-40-a-final-warning/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-40-a-final-warning/index.html
rename to public/library/hackbook/03-40-a-final-warning/index.html
diff --git a/new-site/public/library/hackbook/03-41-feedback/index.html b/public/library/hackbook/03-41-feedback/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-41-feedback/index.html
rename to public/library/hackbook/03-41-feedback/index.html
diff --git a/new-site/public/library/hackbook/03-42-help-the-pmoer-left-on-the-sinking-ship/index.html b/public/library/hackbook/03-42-help-the-pmoer-left-on-the-sinking-ship/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-42-help-the-pmoer-left-on-the-sinking-ship/index.html
rename to public/library/hackbook/03-42-help-the-pmoer-left-on-the-sinking-ship/index.html
diff --git a/new-site/public/library/hackbook/03-43-advice-to-non-pmoers/index.html b/public/library/hackbook/03-43-advice-to-non-pmoers/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-43-advice-to-non-pmoers/index.html
rename to public/library/hackbook/03-43-advice-to-non-pmoers/index.html
diff --git a/new-site/public/library/hackbook/03-44-should-i-tell-my-so/index.html b/public/library/hackbook/03-44-should-i-tell-my-so/index.html
similarity index 100%
rename from new-site/public/library/hackbook/03-44-should-i-tell-my-so/index.html
rename to public/library/hackbook/03-44-should-i-tell-my-so/index.html
diff --git a/new-site/public/library/hackbook/04-01-the-instructions/index.html b/public/library/hackbook/04-01-the-instructions/index.html
similarity index 100%
rename from new-site/public/library/hackbook/04-01-the-instructions/index.html
rename to public/library/hackbook/04-01-the-instructions/index.html
diff --git a/new-site/public/library/hackbook/04-02-rebt-coping-statements/index.html b/public/library/hackbook/04-02-rebt-coping-statements/index.html
similarity index 100%
rename from new-site/public/library/hackbook/04-02-rebt-coping-statements/index.html
rename to public/library/hackbook/04-02-rebt-coping-statements/index.html
diff --git a/new-site/public/library/hackbook/05-01-scripts-01/index.html b/public/library/hackbook/05-01-scripts-01/index.html
similarity index 100%
rename from new-site/public/library/hackbook/05-01-scripts-01/index.html
rename to public/library/hackbook/05-01-scripts-01/index.html
diff --git a/new-site/public/library/hackbook/05-01-scripts-02/index.html b/public/library/hackbook/05-01-scripts-02/index.html
similarity index 100%
rename from new-site/public/library/hackbook/05-01-scripts-02/index.html
rename to public/library/hackbook/05-01-scripts-02/index.html
diff --git a/new-site/public/library/hackbook/05-01-scripts-03/index.html b/public/library/hackbook/05-01-scripts-03/index.html
similarity index 100%
rename from new-site/public/library/hackbook/05-01-scripts-03/index.html
rename to public/library/hackbook/05-01-scripts-03/index.html
diff --git a/new-site/public/library/hackbook/05-01-scripts-04/index.html b/public/library/hackbook/05-01-scripts-04/index.html
similarity index 100%
rename from new-site/public/library/hackbook/05-01-scripts-04/index.html
rename to public/library/hackbook/05-01-scripts-04/index.html
diff --git a/new-site/public/library/hackbook/05-01-scripts-05/index.html b/public/library/hackbook/05-01-scripts-05/index.html
similarity index 100%
rename from new-site/public/library/hackbook/05-01-scripts-05/index.html
rename to public/library/hackbook/05-01-scripts-05/index.html
diff --git a/new-site/public/library/hackbook/fin/index.html b/public/library/hackbook/fin/index.html
similarity index 100%
rename from new-site/public/library/hackbook/fin/index.html
rename to public/library/hackbook/fin/index.html
diff --git a/new-site/public/library/hackbook/index.html b/public/library/hackbook/index.html
similarity index 100%
rename from new-site/public/library/hackbook/index.html
rename to public/library/hackbook/index.html
diff --git a/new-site/public/library/hackbook/index.xml b/public/library/hackbook/index.xml
similarity index 100%
rename from new-site/public/library/hackbook/index.xml
rename to public/library/hackbook/index.xml
diff --git a/new-site/public/library/index.html b/public/library/index.html
similarity index 100%
rename from new-site/public/library/index.html
rename to public/library/index.html
diff --git a/new-site/public/library/index.xml b/public/library/index.xml
similarity index 100%
rename from new-site/public/library/index.xml
rename to public/library/index.xml
diff --git a/new-site/public/library/ted-kaczynski/ecofascism-an-aberrant-branch-of-leftism/index.html b/public/library/ted-kaczynski/ecofascism-an-aberrant-branch-of-leftism/index.html
similarity index 100%
rename from new-site/public/library/ted-kaczynski/ecofascism-an-aberrant-branch-of-leftism/index.html
rename to public/library/ted-kaczynski/ecofascism-an-aberrant-branch-of-leftism/index.html
diff --git a/new-site/public/library/ted-kaczynski/forward-to-technological-slavery/index.html b/public/library/ted-kaczynski/forward-to-technological-slavery/index.html
similarity index 100%
rename from new-site/public/library/ted-kaczynski/forward-to-technological-slavery/index.html
rename to public/library/ted-kaczynski/forward-to-technological-slavery/index.html
diff --git a/new-site/public/library/ted-kaczynski/hit-where-it-hurts/index.html b/public/library/ted-kaczynski/hit-where-it-hurts/index.html
similarity index 100%
rename from new-site/public/library/ted-kaczynski/hit-where-it-hurts/index.html
rename to public/library/ted-kaczynski/hit-where-it-hurts/index.html
diff --git a/new-site/public/library/ted-kaczynski/index.html b/public/library/ted-kaczynski/index.html
similarity index 100%
rename from new-site/public/library/ted-kaczynski/index.html
rename to public/library/ted-kaczynski/index.html
diff --git a/new-site/public/library/ted-kaczynski/index.xml b/public/library/ted-kaczynski/index.xml
similarity index 100%
rename from new-site/public/library/ted-kaczynski/index.xml
rename to public/library/ted-kaczynski/index.xml
diff --git a/new-site/public/library/ted-kaczynski/industrial-society-and-its-future/index.html b/public/library/ted-kaczynski/industrial-society-and-its-future/index.html
similarity index 100%
rename from new-site/public/library/ted-kaczynski/industrial-society-and-its-future/index.html
rename to public/library/ted-kaczynski/industrial-society-and-its-future/index.html
diff --git a/new-site/public/library/ted-kaczynski/morality-and-revolution/index.html b/public/library/ted-kaczynski/morality-and-revolution/index.html
similarity index 100%
rename from new-site/public/library/ted-kaczynski/morality-and-revolution/index.html
rename to public/library/ted-kaczynski/morality-and-revolution/index.html
diff --git a/new-site/public/library/ted-kaczynski/progress-vs-liberty/index.html b/public/library/ted-kaczynski/progress-vs-liberty/index.html
similarity index 100%
rename from new-site/public/library/ted-kaczynski/progress-vs-liberty/index.html
rename to public/library/ted-kaczynski/progress-vs-liberty/index.html
diff --git a/new-site/public/library/ted-kaczynski/ship-of-fools/index.html b/public/library/ted-kaczynski/ship-of-fools/index.html
similarity index 100%
rename from new-site/public/library/ted-kaczynski/ship-of-fools/index.html
rename to public/library/ted-kaczynski/ship-of-fools/index.html
diff --git a/new-site/public/library/ted-kaczynski/the-littering-ape/index.html b/public/library/ted-kaczynski/the-littering-ape/index.html
similarity index 100%
rename from new-site/public/library/ted-kaczynski/the-littering-ape/index.html
rename to public/library/ted-kaczynski/the-littering-ape/index.html
diff --git a/new-site/public/library/ted-kaczynski/the-long-term-outcome-of-geo-engineering/index.html b/public/library/ted-kaczynski/the-long-term-outcome-of-geo-engineering/index.html
similarity index 100%
rename from new-site/public/library/ted-kaczynski/the-long-term-outcome-of-geo-engineering/index.html
rename to public/library/ted-kaczynski/the-long-term-outcome-of-geo-engineering/index.html
diff --git a/new-site/public/library/ted-kaczynski/the-road-to-revolution/index.html b/public/library/ted-kaczynski/the-road-to-revolution/index.html
similarity index 100%
rename from new-site/public/library/ted-kaczynski/the-road-to-revolution/index.html
rename to public/library/ted-kaczynski/the-road-to-revolution/index.html
diff --git a/new-site/public/library/ted-kaczynski/the-systems-neatest-trick/index.html b/public/library/ted-kaczynski/the-systems-neatest-trick/index.html
similarity index 100%
rename from new-site/public/library/ted-kaczynski/the-systems-neatest-trick/index.html
rename to public/library/ted-kaczynski/the-systems-neatest-trick/index.html
diff --git a/new-site/public/library/ted-kaczynski/the-techies-wet-dreams/index.html b/public/library/ted-kaczynski/the-techies-wet-dreams/index.html
similarity index 100%
rename from new-site/public/library/ted-kaczynski/the-techies-wet-dreams/index.html
rename to public/library/ted-kaczynski/the-techies-wet-dreams/index.html
diff --git a/new-site/public/library/ted-kaczynski/the-truth-about-primitive-life-a-critique-of-anarchoprimitivism/index.html b/public/library/ted-kaczynski/the-truth-about-primitive-life-a-critique-of-anarchoprimitivism/index.html
similarity index 100%
rename from new-site/public/library/ted-kaczynski/the-truth-about-primitive-life-a-critique-of-anarchoprimitivism/index.html
rename to public/library/ted-kaczynski/the-truth-about-primitive-life-a-critique-of-anarchoprimitivism/index.html
diff --git a/new-site/public/library/ted-kaczynski/when-non-violence-is-suicide/index.html b/public/library/ted-kaczynski/when-non-violence-is-suicide/index.html
similarity index 100%
rename from new-site/public/library/ted-kaczynski/when-non-violence-is-suicide/index.html
rename to public/library/ted-kaczynski/when-non-violence-is-suicide/index.html
diff --git a/new-site/public/library/ted-kaczynski/why-the-technological-system-will-destroy-itself/index.html b/public/library/ted-kaczynski/why-the-technological-system-will-destroy-itself/index.html
similarity index 100%
rename from new-site/public/library/ted-kaczynski/why-the-technological-system-will-destroy-itself/index.html
rename to public/library/ted-kaczynski/why-the-technological-system-will-destroy-itself/index.html
diff --git a/new-site/public/rss.svg b/public/rss.svg
similarity index 100%
rename from new-site/public/rss.svg
rename to public/rss.svg
diff --git a/new-site/public/sitemap.xml b/public/sitemap.xml
similarity index 100%
rename from new-site/public/sitemap.xml
rename to public/sitemap.xml
diff --git a/new-site/public/style.css b/public/style.css
similarity index 100%
rename from new-site/public/style.css
rename to public/style.css
diff --git a/new-site/public/tags/blog/index.html b/public/tags/blog/index.html
similarity index 100%
rename from new-site/public/tags/blog/index.html
rename to public/tags/blog/index.html
diff --git a/new-site/public/tags/blog/index.xml b/public/tags/blog/index.xml
similarity index 100%
rename from new-site/public/tags/blog/index.xml
rename to public/tags/blog/index.xml
diff --git a/new-site/public/tags/hackbook/index.html b/public/tags/hackbook/index.html
similarity index 100%
rename from new-site/public/tags/hackbook/index.html
rename to public/tags/hackbook/index.html
diff --git a/new-site/public/tags/hackbook/index.xml b/public/tags/hackbook/index.xml
similarity index 100%
rename from new-site/public/tags/hackbook/index.xml
rename to public/tags/hackbook/index.xml
diff --git a/new-site/public/tags/index.html b/public/tags/index.html
similarity index 100%
rename from new-site/public/tags/index.html
rename to public/tags/index.html
diff --git a/new-site/public/tags/index.xml b/public/tags/index.xml
similarity index 100%
rename from new-site/public/tags/index.xml
rename to public/tags/index.xml
diff --git a/new-site/public/tags/library/index.html b/public/tags/library/index.html
similarity index 100%
rename from new-site/public/tags/library/index.html
rename to public/tags/library/index.html
diff --git a/new-site/public/tags/library/index.xml b/public/tags/library/index.xml
similarity index 100%
rename from new-site/public/tags/library/index.xml
rename to public/tags/library/index.xml
diff --git a/new-site/public/tags/ted-kaczynski/index.html b/public/tags/ted-kaczynski/index.html
similarity index 100%
rename from new-site/public/tags/ted-kaczynski/index.html
rename to public/tags/ted-kaczynski/index.html
diff --git a/new-site/public/tags/ted-kaczynski/index.xml b/public/tags/ted-kaczynski/index.xml
similarity index 100%
rename from new-site/public/tags/ted-kaczynski/index.xml
rename to public/tags/ted-kaczynski/index.xml
diff --git a/new-site/public/tags/updates/index.html b/public/tags/updates/index.html
similarity index 100%
rename from new-site/public/tags/updates/index.html
rename to public/tags/updates/index.html
diff --git a/new-site/public/tags/updates/index.xml b/public/tags/updates/index.xml
similarity index 100%
rename from new-site/public/tags/updates/index.xml
rename to public/tags/updates/index.xml
diff --git a/new-site/public/updates/helloworld/index.html b/public/updates/helloworld/index.html
similarity index 100%
rename from new-site/public/updates/helloworld/index.html
rename to public/updates/helloworld/index.html
diff --git a/new-site/public/updates/index.html b/public/updates/index.html
similarity index 100%
rename from new-site/public/updates/index.html
rename to public/updates/index.html
diff --git a/new-site/public/updates/index.xml b/public/updates/index.xml
similarity index 100%
rename from new-site/public/updates/index.xml
rename to public/updates/index.xml
diff --git a/new-site/public/updates/updated-the-css-again/index.html b/public/updates/updated-the-css-again/index.html
similarity index 100%
rename from new-site/public/updates/updated-the-css-again/index.html
rename to public/updates/updated-the-css-again/index.html
diff --git a/new-site/public/updates/yoinked-css/index.html b/public/updates/yoinked-css/index.html
similarity index 100%
rename from new-site/public/updates/yoinked-css/index.html
rename to public/updates/yoinked-css/index.html
diff --git a/new-site/static/favicon.ico b/static/favicon.ico
similarity index 100%
rename from new-site/static/favicon.ico
rename to static/favicon.ico
diff --git a/new-site/static/hackbook/hackbook.pdf b/static/hackbook/hackbook.pdf
similarity index 100%
rename from new-site/static/hackbook/hackbook.pdf
rename to static/hackbook/hackbook.pdf
diff --git a/new-site/static/img/ab67706c0000da8432f03af2b48b93d104186742.jpg b/static/img/ab67706c0000da8432f03af2b48b93d104186742.jpg
similarity index 100%
rename from new-site/static/img/ab67706c0000da8432f03af2b48b93d104186742.jpg
rename to static/img/ab67706c0000da8432f03af2b48b93d104186742.jpg
diff --git a/new-site/static/img/blinky.gif b/static/img/blinky.gif
similarity index 100%
rename from new-site/static/img/blinky.gif
rename to static/img/blinky.gif
diff --git a/new-site/static/img/burst-updated.gif b/static/img/burst-updated.gif
similarity index 100%
rename from new-site/static/img/burst-updated.gif
rename to static/img/burst-updated.gif
diff --git a/new-site/static/img/construction.gif b/static/img/construction.gif
similarity index 100%
rename from new-site/static/img/construction.gif
rename to static/img/construction.gif
diff --git a/new-site/static/img/construction2.gif b/static/img/construction2.gif
similarity index 100%
rename from new-site/static/img/construction2.gif
rename to static/img/construction2.gif
diff --git a/new-site/static/img/custom-index-directory.PNG b/static/img/custom-index-directory.PNG
similarity index 100%
rename from new-site/static/img/custom-index-directory.PNG
rename to static/img/custom-index-directory.PNG
diff --git a/new-site/static/img/gigachad_orthodox.jpg b/static/img/gigachad_orthodox.jpg
similarity index 100%
rename from new-site/static/img/gigachad_orthodox.jpg
rename to static/img/gigachad_orthodox.jpg
diff --git a/new-site/static/img/layout-custom-index.PNG b/static/img/layout-custom-index.PNG
similarity index 100%
rename from new-site/static/img/layout-custom-index.PNG
rename to static/img/layout-custom-index.PNG
diff --git a/new-site/static/img/new_turning.gif b/static/img/new_turning.gif
similarity index 100%
rename from new-site/static/img/new_turning.gif
rename to static/img/new_turning.gif
diff --git a/new-site/static/img/oops.gif b/static/img/oops.gif
similarity index 100%
rename from new-site/static/img/oops.gif
rename to static/img/oops.gif
diff --git a/new-site/static/img/wip.gif b/static/img/wip.gif
similarity index 100%
rename from new-site/static/img/wip.gif
rename to static/img/wip.gif
diff --git a/new-site/static/style.css b/static/style.css
similarity index 100%
rename from new-site/static/style.css
rename to static/style.css
diff --git a/new-site/themes/lugo/.github/workflows/upload.yml b/themes/lugo/.github/workflows/upload.yml
similarity index 100%
rename from new-site/themes/lugo/.github/workflows/upload.yml
rename to themes/lugo/.github/workflows/upload.yml
diff --git a/new-site/themes/lugo/README.md b/themes/lugo/README.md
similarity index 100%
rename from new-site/themes/lugo/README.md
rename to themes/lugo/README.md
diff --git a/new-site/themes/lugo/archetypes/default.md b/themes/lugo/archetypes/default.md
similarity index 100%
rename from new-site/themes/lugo/archetypes/default.md
rename to themes/lugo/archetypes/default.md
diff --git a/new-site/themes/lugo/config.toml b/themes/lugo/config.toml
similarity index 100%
rename from new-site/themes/lugo/config.toml
rename to themes/lugo/config.toml
diff --git a/new-site/themes/lugo/layouts/_default/baseof.html b/themes/lugo/layouts/_default/baseof.html
similarity index 100%
rename from new-site/themes/lugo/layouts/_default/baseof.html
rename to themes/lugo/layouts/_default/baseof.html
diff --git a/new-site/themes/lugo/layouts/_default/for-library-books/single-page-books.html b/themes/lugo/layouts/_default/for-library-books/single-page-books.html
similarity index 100%
rename from new-site/themes/lugo/layouts/_default/for-library-books/single-page-books.html
rename to themes/lugo/layouts/_default/for-library-books/single-page-books.html
diff --git a/new-site/themes/lugo/layouts/_default/hackbook/order-by-oldest.html b/themes/lugo/layouts/_default/hackbook/order-by-oldest.html
similarity index 100%
rename from new-site/themes/lugo/layouts/_default/hackbook/order-by-oldest.html
rename to themes/lugo/layouts/_default/hackbook/order-by-oldest.html
diff --git a/new-site/themes/lugo/layouts/_default/index.html b/themes/lugo/layouts/_default/index.html
similarity index 100%
rename from new-site/themes/lugo/layouts/_default/index.html
rename to themes/lugo/layouts/_default/index.html
diff --git a/new-site/themes/lugo/layouts/_default/list.html b/themes/lugo/layouts/_default/list.html
similarity index 100%
rename from new-site/themes/lugo/layouts/_default/list.html
rename to themes/lugo/layouts/_default/list.html
diff --git a/new-site/themes/lugo/layouts/_default/rss.xml b/themes/lugo/layouts/_default/rss.xml
similarity index 100%
rename from new-site/themes/lugo/layouts/_default/rss.xml
rename to themes/lugo/layouts/_default/rss.xml
diff --git a/new-site/themes/lugo/layouts/_default/single.html b/themes/lugo/layouts/_default/single.html
similarity index 100%
rename from new-site/themes/lugo/layouts/_default/single.html
rename to themes/lugo/layouts/_default/single.html
diff --git a/new-site/themes/lugo/layouts/partials/anchored_headings.html b/themes/lugo/layouts/partials/anchored_headings.html
similarity index 100%
rename from new-site/themes/lugo/layouts/partials/anchored_headings.html
rename to themes/lugo/layouts/partials/anchored_headings.html
diff --git a/new-site/themes/lugo/layouts/partials/nav.html b/themes/lugo/layouts/partials/nav.html
similarity index 100%
rename from new-site/themes/lugo/layouts/partials/nav.html
rename to themes/lugo/layouts/partials/nav.html
diff --git a/new-site/themes/lugo/layouts/partials/nextprev.html b/themes/lugo/layouts/partials/nextprev.html
similarity index 100%
rename from new-site/themes/lugo/layouts/partials/nextprev.html
rename to themes/lugo/layouts/partials/nextprev.html
diff --git a/new-site/themes/lugo/layouts/partials/taglist.html b/themes/lugo/layouts/partials/taglist.html
similarity index 100%
rename from new-site/themes/lugo/layouts/partials/taglist.html
rename to themes/lugo/layouts/partials/taglist.html
diff --git a/new-site/themes/lugo/layouts/shortcodes/10_recent_posts.html b/themes/lugo/layouts/shortcodes/10_recent_posts.html
similarity index 100%
rename from new-site/themes/lugo/layouts/shortcodes/10_recent_posts.html
rename to themes/lugo/layouts/shortcodes/10_recent_posts.html
diff --git a/new-site/themes/lugo/layouts/shortcodes/center.html b/themes/lugo/layouts/shortcodes/center.html
similarity index 100%
rename from new-site/themes/lugo/layouts/shortcodes/center.html
rename to themes/lugo/layouts/shortcodes/center.html
diff --git a/new-site/themes/lugo/layouts/shortcodes/h1.html b/themes/lugo/layouts/shortcodes/h1.html
similarity index 100%
rename from new-site/themes/lugo/layouts/shortcodes/h1.html
rename to themes/lugo/layouts/shortcodes/h1.html
diff --git a/new-site/themes/lugo/layouts/shortcodes/h2.html b/themes/lugo/layouts/shortcodes/h2.html
similarity index 100%
rename from new-site/themes/lugo/layouts/shortcodes/h2.html
rename to themes/lugo/layouts/shortcodes/h2.html
diff --git a/new-site/themes/lugo/layouts/shortcodes/h3.html b/themes/lugo/layouts/shortcodes/h3.html
similarity index 100%
rename from new-site/themes/lugo/layouts/shortcodes/h3.html
rename to themes/lugo/layouts/shortcodes/h3.html
diff --git a/new-site/themes/lugo/layouts/shortcodes/h4.html b/themes/lugo/layouts/shortcodes/h4.html
similarity index 100%
rename from new-site/themes/lugo/layouts/shortcodes/h4.html
rename to themes/lugo/layouts/shortcodes/h4.html
diff --git a/new-site/themes/lugo/layouts/shortcodes/h5.html b/themes/lugo/layouts/shortcodes/h5.html
similarity index 100%
rename from new-site/themes/lugo/layouts/shortcodes/h5.html
rename to themes/lugo/layouts/shortcodes/h5.html
diff --git a/new-site/themes/lugo/layouts/shortcodes/h6.html b/themes/lugo/layouts/shortcodes/h6.html
similarity index 100%
rename from new-site/themes/lugo/layouts/shortcodes/h6.html
rename to themes/lugo/layouts/shortcodes/h6.html
diff --git a/new-site/themes/lugo/layouts/shortcodes/hidvid.html b/themes/lugo/layouts/shortcodes/hidvid.html
similarity index 100%
rename from new-site/themes/lugo/layouts/shortcodes/hidvid.html
rename to themes/lugo/layouts/shortcodes/hidvid.html
diff --git a/new-site/themes/lugo/layouts/shortcodes/img.html b/themes/lugo/layouts/shortcodes/img.html
similarity index 100%
rename from new-site/themes/lugo/layouts/shortcodes/img.html
rename to themes/lugo/layouts/shortcodes/img.html
diff --git a/new-site/themes/lugo/layouts/shortcodes/tagcloud.html b/themes/lugo/layouts/shortcodes/tagcloud.html
similarity index 100%
rename from new-site/themes/lugo/layouts/shortcodes/tagcloud.html
rename to themes/lugo/layouts/shortcodes/tagcloud.html
diff --git a/new-site/themes/lugo/layouts/shortcodes/toc.html b/themes/lugo/layouts/shortcodes/toc.html
similarity index 100%
rename from new-site/themes/lugo/layouts/shortcodes/toc.html
rename to themes/lugo/layouts/shortcodes/toc.html
diff --git a/new-site/themes/lugo/layouts/shortcodes/vid.html b/themes/lugo/layouts/shortcodes/vid.html
similarity index 100%
rename from new-site/themes/lugo/layouts/shortcodes/vid.html
rename to themes/lugo/layouts/shortcodes/vid.html
diff --git a/new-site/themes/lugo/static/former_style.css b/themes/lugo/static/former_style.css
similarity index 100%
rename from new-site/themes/lugo/static/former_style.css
rename to themes/lugo/static/former_style.css
diff --git a/new-site/themes/lugo/static/rss.svg b/themes/lugo/static/rss.svg
similarity index 100%
rename from new-site/themes/lugo/static/rss.svg
rename to themes/lugo/static/rss.svg