Renaming and refactoring - 0.1.0