Continued eradication of packages directories

Continued eradication of packages directories