Closes #127 - the new structure is now taken into account.

Closes #127 - the new structure is now taken into account. #177