reorganized the filestructure