restructured lib directory
build-6