Cleanup.

Accidentally commited files from previous directory structure. (The same
files are still present however in different directory). And they are
duplicated.