Message refactoring
Refactoring attributes
Refactoring files