Finish directory restructuring, having moved some files to their right places.

Signed-off-by: Se7enChat <se7enchat@zoho.com>