Rearanging file layout to better match RPM bulilds.