Re-jigging classes a bit
Skin naming