Working on organisation of the repository