Major update to restructure app