Move type to own files