Refactored build system and enabled controllers