Reconfigure the project to use init.templatedir instead of symlnks
Merge changes