improve packages structure
Refactor project structure