Move package mapping to Source