Moved Some files around... For protection!
Fixed linking issues with file move for pickup
Fixed linking issues for catered_events