Refactor js org