Refactor package tree
Correct imports and packages
Organize
Modified tree
Fixes compilation errors
Fixes compilation errors
Update the license