refactor some into fpd project