Folder Renames, and old folder removal

- Removed old TE
- Changed some of the folder names to better match
- Shorten  WRCBE