small changes to file structure