Directory structure change.
Rename methods.
Readme update.