Change dir names, add signals...