small changes, files were renamed