Code Reorg
Added screen factory