Reorganize project.
Fix merge.