abandon single file policy and bump to version 3.1.0