SkaveRat some restructuring