cleanup and add a new common class, FPModBase