Refactored namespace and added a Screen stub