Mainly fixed resource stuff.
Removed unneeded Class.
Stuff.