Add glm. Misc cleanup and moving of things.