Finally created a new *working* build file, moved a few things around.