Initial fixes.
Redo directory structure.