Experimental classes moved to their own package