Moved all the OnClicks to the same folder and started to refactor that system.