Refactoring
Added mapping and cscope db autoloading