Refactoring to prepare release 1.0.0