Fixed config-files and main-class