Restructured the Main.Albums controller.