Refactor I1Application and Configuration