Further organization of the rest and pack objects to facilitate the
custom packs

Signed-off-by: Dalton Pelc <daltonjpelc@gmail.com>