Changed: class layout to match correct auto loader.