Refactored some file names. Added new questions.