Switched to a more sane directory layout