UI libraries namespaces refactoring