move apps to proper module