fix repository hierarchy