Move sub-projects into root dir.

This gets rid of the modules sub-dir for sub-projects and just moves
them up to the root directory.