Moved config to -Default and changed code order for pretty naming