restructure app
restructure