Try to enhance directory stucture