Added own config file, some refactoring.