Updated structure of lib