Renamed directory, updated namespaces, updated msbuild