Further removal of folders folder.
Storing of rules updated to include RuleTypes.
Logic for moving files and folders updated. Initial tests are good.