Adjusted directory structure