Moved to subfolder, small updates. Prepping for importing into Munkiserver.