Restructuring the repo a bit to make things neater.