restructure files, close #4.