Reorganized the build