changing file structure and add Q64