Code refactored
DS store
Merge pull request #17 from 4justinstewart/Restructure

Restructure