Reorganized directory structure.
Cleanup