Generator: More file structure refurbishing