Dir constants, config restructuring