Renamed files and folders for more consistent naming convention