Directory restructure
Trim added to Utils