Renamed files to be more in line with new architecture