Removed unneeded files, converted last file names over to the proper namespace.