Fixed remaining issues with directory structure, name of SFTree class.
Removed all zombie references to files that no longer exist.