New structure updated
Source code updated