More file structure cleaning
Cleaning cleaning
Even more cleaning
Merge branch 'live'