cleaning up the file structure