New Ejecta class and filename cleanup