Directory structure improved