Changes to structure, new test cases support

* All cases 1.*-2.* should be working
* Test cases 3.* (except 3.6) are NOT working but prepared for
* Application does not have comments yet.