compilation fix. cleanup.
[WIP] - Binary client continues... #2
Removed wrong named files.
Updated file names.