Switch to new level format; Refactoring;