Directory structure improvements