cleaning up file structure
more cleanup