Renamed files
Fixed some problems
Fixed some name's problems