flatten the library hierarchy (again)
add the alias of call/cc