change folder structure to reflect new standards.