Move another classes outside