Changed every resource to its own klass