Moved stuff in classes