Restructed

Changed methods, objects and vars in Strapd