Move type functions into a separate file

• Move type functions into a separate file
• Update type functions in the lib