final draft of file structure based on #9