Removed useless OnOp Events; Changed some file structure around