Reestructure Part II.
Merge branch 'master' of https://github.com/sandoval/tr1-2