reorganize
should manually ignore interfacestate file