-Converting to new MUnit file structure