Several fixes
Renamed files