Cleaned up and renamed to more user friendly file names.