Fix challenge numbers and move to challenges/ dir

Fix challenge numbers and move to challenges/ dir #20