Moved to own file
Fixed server include...dunno how this got changed