First exercise done
Structure and build cleanup
Merge branch 'dev'