Namespace folder
Merged changes which provide basic support for the default project's namespace restoration.