back to correct file structure, ready to merge changes