Total refactoring; Proper README