Updates to folder handling and installer package