Reorganized directory structure

Hopefully the history follows... hold on to yer butts!