fixed the separator thing, and cut-paste of files,
Maybe refactoring method for string manipulation would be a good idea -> need to be inspected.

TODO: Adding files that could be deleted in the configuration