Organize classes into packages.
Remove duplicate jar lib