Moved some stuff around
Merge github.com:linkedtv/editortool