Better structure of the repo