Code cleanup
Renaming conf file