reorganize packages and tests