changed file structure to match server