diff --git a/.gitignore b/astroid/.gitignore
similarity index 100%
rename from .gitignore
rename to astroid/.gitignore
diff --git a/config b/astroid/config
similarity index 100%
rename from config
rename to astroid/config
diff --git a/hooks/unspam b/astroid/hooks/unspam
similarity index 100%
rename from hooks/unspam
rename to astroid/hooks/unspam
diff --git a/keybindings b/astroid/keybindings
similarity index 100%
rename from keybindings
rename to astroid/keybindings
diff --git a/keybindings.orig b/astroid/keybindings.orig
similarity index 100%
rename from keybindings.orig
rename to astroid/keybindings.orig
diff --git a/poll.sh b/astroid/poll.sh
similarity index 100%
rename from poll.sh
rename to astroid/poll.sh
diff --git a/scripts/move-tag.sh b/astroid/scripts/move-tag.sh
similarity index 100%
rename from scripts/move-tag.sh
rename to astroid/scripts/move-tag.sh
diff --git a/scripts/tag-folder-rules.sh b/astroid/scripts/tag-folder-rules.sh
similarity index 100%
rename from scripts/tag-folder-rules.sh
rename to astroid/scripts/tag-folder-rules.sh
diff --git a/scripts/tag-folder.sh b/astroid/scripts/tag-folder.sh
similarity index 100%
rename from scripts/tag-folder.sh
rename to astroid/scripts/tag-folder.sh
diff --git a/scripts/tag-list.csv b/astroid/scripts/tag-list.csv
similarity index 100%
rename from scripts/tag-list.csv
rename to astroid/scripts/tag-list.csv
diff --git a/scripts/tag-thread.sh b/astroid/scripts/tag-thread.sh
similarity index 100%
rename from scripts/tag-thread.sh
rename to astroid/scripts/tag-thread.sh
diff --git a/searches b/astroid/searches
similarity index 100%
rename from searches
rename to astroid/searches
diff --git a/signature.txt b/astroid/signature.txt
similarity index 100%
rename from signature.txt
rename to astroid/signature.txt
diff --git a/ui/.gitignore b/astroid/ui/.gitignore
similarity index 100%
rename from ui/.gitignore
rename to astroid/ui/.gitignore
diff --git a/ui/thread-view.scss b/astroid/ui/thread-view.scss
similarity index 100%
rename from ui/thread-view.scss
rename to astroid/ui/thread-view.scss
diff --git a/ui/ui-master b/astroid/ui/ui-master
similarity index 100%
rename from ui/ui-master
rename to astroid/ui/ui-master