Moved content into its own folder and namespace.