some reorganizing of files in folders, still experimenting with throttling