Various refactoring
More refactoring
Removed Typescript
More various refactoring
Merging refactoring