Redo directory structure.

Breaks installer script, will fix in the next version.