beginnings of more sane directory structure
new directory structure aaa