lib -> vendor, src -> lib, and small fixes