Also move the save_post actions to the admin class to make sure they are only hooked in on the admin side.