Changes to file structure for the next meeting

Lets do this