Cleanup Finished

Renamed and rearranged files