remove dupplicate cstruct & move cstruct into module