Refactoring
Updated license and readme