OSX and Android support. Major restructure.