unzipped upgrade files and reworked directory structure