MAPE Restructure - Idea 1 Current Structure