Breaking code up.
File rename.
Fixes.
README
Minor cleanup.