New Structure

Modified the structure