Add config file && Refactoring