Build event for creating those folders and other fixes