move libs and work on search