Moving functions add_action into individual files

Still need major cleanup to functions