Move class loading responsibility