Updated structure

-separated views by UI element.