Restructuring and build process