Restructure for sanity
Correct missed config file reference in 63f4c521 restructure
Correct require_ statement to reference new naming