Moved to assignments package

Anticipating future improvements