Finally separate files