Reorganize files, and specify dependencies.