Refactor screen folder