Implemented new configuration structure

This closes #2