Update README & Refactoring