restructured pycore/lib