BIG REFACTOR
  - Add new syntax
  - Start remove old syntax
  - Start project modularization