Moving values to attirbutes, and restructuring resources
Merge pull request #1 from MathYourLife/update_for_081

Moving values to attirbutes, and restructuring resources