Moving some files around, plus Updating OSX solution