Wrapped modules in namespace
Version 2013 fixes