Changes before repo restructure.