Better organization
Fixes