reestructure my app