Updates V1

Design and structure updates