Clean up

Renamed files and sorted file structure