More refactoring, more unit tests
Prepare v0.3.0