minor changes to file structure