Fleshed directory structure out