Major file name refactoring
Adapted to newest ssvu
Added comment 
Fixed warnings/bugs
(thanks Daniel!)