Minor clean up, rename files