refactoring some of the file inclusions