restructure app
restructure app