Redid file structure, and cleaning things up