Refactor code
refactor code
Reorganize maven packages