Fixed configuration files.

The main config was merged into the album config file.