changes to file structure and comments