Refactoring. Road to v1.0.0