Reorganized directory structure

Signed-off-by: Mike Lewis <mikelewis@alphalem.com>
Merge branch 'master' of https://github.com/crunchex/gary-mk2