Move trim/path out of class, implement move