instances and classes moved to correct files
Authored by: mikeward 2014-04-15
Parent: [r3309]
Child: [r3311]