Fix directory package mapping