Re-Factoring the folder structure to orderedBy Feature.