Rename files (no longer calling this "ballbuster") and clean up FS