Cleanup and directory restructure.
Finished restructure. Tested.