Move screens into their own package