Put aspect code in entities. Removed some dummy data.
Merge pull request #1 from TAllen/filefix

Put aspect code in entities. Removed some dummy data.