Cleaning files, making some renaming operations and some small refactorings