Minor changes to folder names and structure.
Yet another commit.
.