Modified the build script in MacOS X to use the new project structure