Separated classes into packages (spi, gae)
Renamed package