Moved the code in this repository so it is easier to re-use across different projects
Fixed the language