Configuration cleanup and recipe

Cleaned up unused & duplicated configuration files
Udpated recipe to patch using git-apply command.