(#1449) - move uuid files into folders part deux

not ready, will give a shout when it is