reorg some file structure that was causing null warnings