add logging and fix paths for new folder structure