change structure for maven2 later