Converted some files to Typescript