More solid project layout.
Merge branch 'master' of https://github.com/jtompkins/opticon