Config file
Code clean up and re org