move all extended types to common area
formatting