Added main components and structure