Made changes to core structure; added comments.
Merge pull request #1 from bkford/master

Made changes to core structure; added comments.