Updated configuration, moved to /opt
merge