refactored many basic objects
Merge pull request #48 from dalexj/alex

refactored many basic objects