restructured lib directory