Clean Up and Clarification

Updating README and moving code around.