First steps of a better runtime organization.

1. Deployed locations remain the same.... for now.