Please get rid of all unnecessary Screen widgets moving them to the Legacy Package and ideally rename the rest keeping some general convention.
