More Restructuring of the application