Added %dir declarations to packages