Separation into two files