Re-arranged file structure.

chapter2-3