More packages to project structure