changed package structure to com.epi uniformly