Made some changes to the structure of the sql files