Moving files around

Creating a more usable directory structure.