a few fixes
renamed files