Added Mac project and a slight re-org

See title.