Moving battle to org.jpokemon package