restructuring, moving libs into lib/