Significant restructuring of AJS. Various changes implemented