Restructured build into multiple modules