I accidentally added changes to the root view instead of the client, so
I fixed that in this commit.
Removed previously duplicated files