now working with repo and new structure