Renamed files for convenience and added controls data
Added subscriptions for controls