Move packages under socorromatic because it makes sense