Fixed up the basics of the build system for the new layout.