Moving Type and Utility headers into api/ folder
Also updating project file. These headers are a core part of the API
after all.