Moving around yet even more classes...