Adding the SplClassLoader, cleaning up