Move libs out of sub modules