rename files so they are in own namespace