scala classes moved to scala directory
interpolator added