changed file structure to reflect dependencies