Moved some inner classes into the com.team2502.scoutingapp package