-Performed several extract class refactoring patterns

Signed-off-by: Byron Maroney <bmaroney@ualberta.ca>