Reorgnize files and names

close #4