Added new files and changed namespaces.