adjusted directory structure