Bug #3320 - Restructure repo structure