Reorganized configs. Fixes #2, resolves #3 and closes #13