Refactoring

Refactoring & readme update