Refactoring code, splitting classes into several files for upcoming tests, removing excessive typedefs
Simply hacking on the code
The code compiles:)