Fixed compilation with custom location of dependencies
Added expressions classes. Also moved from Token to TokenPtr
Prepared for testing