fixing packaging issues due to folder names