Rearrange into standard py pkg format