Update Feature: Moved Controller class as a part of non transparent extension
Update Issue #373: Removed system/controller