clean up with AppRouter and app Ctrl - moved in single module