Move classes to the right namespace