Refactoring code
Adding config files
Refactoring code