re-orging to copy module style