Reorganize files and code.