Cleanup of naming and removed uneeded files.