A bit of reorganization. Also added Arithmetic and Trigonometric optimizations