Reshuffled files a bit and added logging