De-re-factoring?!

Sorry Logan, but some things in your refactoring might cause problems
(notably the changes in main.php) when the site gets more advanced. I
also believe this is a better and more intuitive file structure. We can
discuss this more if you want.