Cleanup of file cruft in directories
Conversion of remaining files to the Fluid object approach