Directory structure more intuitive.