smultron: reorganize files