Resfactor the directory structure
Merge branch 'lee' into develop