Rejigger spritesheet and start refactor