Refactor configurations. Make sure each configuration class is in the
correct spot for mechanics.
Also tweaked Melody.