Include files missed in previous commit
Flatten directory hierarchy.