Restructing the base app