Changed package naming strategy