restructured application
added more structure