Reorganize files and change file names.
Add missing dependencies.