Put things in a proper place, added UUID