Moved mappers to new pacakage
Now controller poller does not run it self.