Finish rework to coffeescript files