restructuring, fixing some dojoization issues