Bunch of updates based on looking at puppet module structure, idea is to make dependencies cleaner