Moved Types to a different namespace