Reshuffled file structure for munee