New struture for pip installing