Moved pokemon to the org package, added tests and stuff