switched directory structure