Refactored buildsystems