Fixed structure of master branch and merged Dan's Code into the branch for testing
Updating Decorator Files