Refactor of solution

Moved Ast-classes to subdirectories;
Fixed unit-test bug;
Fixed formatting