Rename macros file
Add types from cgmath