fixed merged settings, renamed dir to capital prefix
Finishing merge