Added more folder structure.