Reorganized, wrapper shiz, updated Readme
Merged