Moved albumViewer into it's own module