Back to building, refactored code, moved to own projects
More changes to multi-module setup