Some cleanup and folder restructuring.