Directory structure adjusted