Updated structure

Updated the structure