Update Structure of script (avoid GOD class)