Extended unit tests
Updated grammar and parser, lexer
Reordered packages
Uniform code style