Renamed files, class and lot of function and variable