Folder structure redone.