Restructure of Mecanim