Refactored project, added license