bug fixes + structure changes

backup the single language