Moved file to model package