Removed unnecessary folder layer