Refactoring, addition in core cat. files
Files for code addition