API and Tests refactoring
Namespaces refatoring