Deleted old screens and changed namespace and name of new screens