General cleanup of code.
Changed the way Resources work.
Removed trivial classes.
Merge remote-tracking branch 'origin/master'