Final restructuring and adding zip file