Reorganization of file structure

Unhappy with the misc folders and such, so flattening the structure for
now.