File structure cleanup, adding mute feature