mv javascript to js dir. merge latest directive