Re-factored files for rpm compatibility