Fixing repo structure