Dir Structure Updated