Reorganize
Fixes