refactor packages
refactor
first refactor with swarm