fixed up file structure somewhat