More fixes and tweaks
overhaul filenames