Re-arrange directory structure for RPM build