Added spritesets

Updates tests, and some refactorization.