Reordering folder structure for better navigation