Re-Thinking Curriculum for the 21st Century Skills