wip - organize files