rearranged file and cleaup