minor filename and structur changes