Fix layout and add a better folder organization
Merge branch 'develop'