Merged Gatway module into App module.