Renamed package and fixed classpath for new eclipse.