Moved the language folder under the installation as per 2.5 best practices
Code cleaned