Changed strcture of files; prepare content