rename files and small refactoring