Removed unneeded file
Remaned files to fall into one convention