moved other lib modules to sub directories