Organizational Update

Merged branches, organized folders, broke hearts.
Beta Version 0.2.1 update

See README.md and log.txt for changes