more directory restructuring
Merge branch 'master' of https://github.com/happah-graphics/happah