Reorganize, namespace, composer