Refactoring
Changed file extension order for ido