Reorganizing src again and fixing up the build script.