Starting work on new buildfile and moving things around, refs #689