Moved Subviews to UI Package