Move screens to separate file and add specs