update class naming and namespace structure