new filenames/file hierarchy arrangement for Maskin2-3