moved albumtype enum to its own class and changed code in album and albumservice to reflect this new enum