More housekeeping

Organizing the directory structure.