reorganization

think we will start here for now