Redesigned directory structure