reshuffle packages and some new code