Begin changing up application structure etc