Reorganising application and structure