puzzle class, layout folder fix, readme fix