Refactored to move com.apache.* into org.apache