Add Settings and Refactoring
Update Copyright