Restructured object hierarchy according to http://devmag.org.za/2012/07/12/50-tips-for-working-with-unity-best-practices/