Updated Java dir + a couple of convenience aliases