Minor folder structure optimization.