Re do all the application structure