Move class
Merge branch 'master' of https://github.com/ChaoHou/Swen222-Group-Project
FIx bug