Initial commit, taken from svn. Updated namespaces.