Modularized and Reordered patient load process

Change-Id: I834802e02c27241c526ce0a0673a4545dc8c8beb
Signed-off-by: Jeremy Ho <jujaga@gmail.com>
Initial test update pass

Change-Id: Id60e77030001e6ee08ffe766992a142f1fd7d300
Signed-off-by: Jeremy Ho <jujaga@gmail.com>