Move classes to the root directory