Updated configuration files and file locations to be more consistent