core restructured, class for display added, update moved into screens