Move all to one file