Removed two levels of unnecessary directories