some refactoring and name changes, v0.1.0