Added source editing
Refactoring and enabled editting of config