added the right package structure