Improvements: renaming files & more verbose configuration