Another major rework to the directory layout, can't decide what I want :P