Move another classes outside
Added codes