Refactoring expedition to class and rename expedition image file