rename FPADDBaseData to FPBaseData and move to separate module