Renamed Files

Made the names of the files more modular. Untested for errors.