Sub-folder re-organization

...moved files into subfolders.