Renamed and restructured files. Still needs a lot of work.