Directory structure simplified