reorganization of app