Moved the class structure