rename files to remove confusion with src