Fix package directory construction