Fixed folder structure
Merge branch 'byron'