Refactoring, added LICENSE file