Move supporting modules into Core namespace