More refactoring and changing of README.rdoc