Restructured folder heirarchy