Added framework traverser and restructured