restructure.
restructure.
friday session.
Merge pull request #9 from olear/master

merge