Add CLI Translator, remove unused files and update classpath