Files renamed and small fixes.