Refactor + first TS models