Implement new build system
More changes