Reorganize Application and routes.