Directory structure is simplified.