Refactoring config files and few fixes in project view.