small fixes and some files renamed