Another reorganization, and added BasePowerUp class