Refactoring and install on hosting