Removed extra folder layer