re-struct

no more under /libs/