Refactoring almost complete, update README.