re-arrange to follow new plan
Merge pull request #87 from ajschumacher/re-order

re-arrange to follow new plan; resolves #84