Namespace change from com.cloud to org.apache