Complete new configuration format

Moved entire configuratin into an .org file