Fixes some organization to allow for SPAs.
Fixes some organization to allow for SPAs.