Start refactoring
Work
Improve
Improve
Fix readme