Restructure code, Declaration Class, It now works