rearranging and organizing classes based on actions
trying to bugfix