Organize files: Remove no longer used files
wip