Moved stuff to com.jpokemon package for my sanity