Redesign and taking xapp-framework into use