Reorganized for gem
Readme updated.