Fixes #36 - Move albums to separate files