changed the file structure