[!!!][TASK] Introduced namespaces / major code cleanup