(dir) fix package structures