ECDR-32: Moved to plugin folder.
Also cleaned up code and added standard timer prefix in the log.