1.2

-deleted odd files
- Infix and calculate became common for both classes