Refactoring, make it more modular. Pushing to v 0.2.0