Moved to components and layout structure.