1) Turn into proper framework
2) Update license