moving configuration back to modules for now