Added problems and structure