Added hashtables and reorganised previous files