Moved proper views to proper files