Updated readme
Refactoring and structuring source