Nits and picks

Changes to code organization and README. For clarity!