update package structure for maven