cleaned up some of the file structure