Moved file loading to specific file