renamed subfolders.
adapted main to new subfolders.