Refactor Application, imports