Restructured apps into single responsiblity