Restructure app architecture, adjust modules