Made the build directories more logical