File names and packages refactoring.