moved to com.claydonkey namespace