Adopted the right structure including screens and icons