Upload refactor - media/album controllers finished