[TASK] Change TS directory and add auto-include