Delete unusefull controllers + rearranging views