refactor: reorganized structure hey ya