Remove packages
Add individual modules as copies in packages