Port config to a tangled org file
Delete old config files
Configuration edits