fix(lib): code organization