Restructured app module GUI initial work