Add model and model-builder
Clean up static macros and add more to g3d
Fix macros