Major restructure, deployable build