Make folder structure more clear.
Include Language convenience module.