Redo directory structure.

Breaks the installer, will fix in next commit.