Use standard location for configuration path and naming
Updated - support types