finish reorganizing file structure