Arranged problems into separate packages/classes