Updated with minor security fixes and tweaks to fix some unwanted behavior
Removed the extra modules.d directory and combined everything into one