License Data update
Bugs fixes and restructure