Moving even more stuff arround so we can finally get down to working in a nice clean animation-centric environment.