[!!!][TASK] Refactoring: Add namespaces, cleanup, apply CGL