Added usrbin and more changes