Update Skin split up core classes