Build system reorganized