Build system overhaul