Put scala stuff in the right place