reorganise package structure