Remove 2D classes, Add Script class