fixing Guido for new packaging style of P2.0 libraries (no subfolders) and some tweaks here and there