lean and mean
config model cleanup
cleaned up config
renamed
migrated some config