tightened up file structure