Reorganize apps directory.

Also includes broad refactoring of the wq_maker code.