Began moving dependencies to lib