Change structure of files to reflect com.punkware.map-sql