move class to Bundle subnamespace