implemented new configuration approach, refactored namespaces