Reorganizing naming.
Some renaming, more info on the readme.