Added test activity
Refactored namespaces