Solution structure refactoring
Screens Map added