some restructure

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
pagination and token