[TASK] Cleanup and move called classes to namespaces