refactored config & local files