upd: organize files