Fix directories and add installation of AJ