Revert "Uodated repo struct."

This reverts commit ff73ca90c508e5758391a491d2b75c06e3c72c92.
Revert "Revert "Uodated repo struct.""

This reverts commit 3f1ee547c3f052b43f5d1e234133f3809051a6c1.
Merge remote-tracking branch 'origin/master'