Added setup, moved library into lib.