Changes to Movement and Component factory pattern.