Move to a single file (otherwise a package would be required)