fixing up file structure