Refactor, version 0.1.0 release