Reorganize PS stuff

Signed-off-by: Tuan T. Pham <tuan@vt.edu>