Start of code base layout restructuring.