reorganize and rename some things