New packages structure
Improve code quality