Restructure for better trainers:

See here: http://pokemonnxt.boards.net/thread/279/important-tidying-code-restructure