Renamed files to improve consistency
Renamed files for a more uniform file structure