Moving the classes code