Adapted to newest ssvu
Added missing include
Name refactoring
Major refactoring