Reorganization and updated for TE3