Moved config file to root
Some code cleanup