[TASK] Cleanup and streamline with new namespaces, composer etc