Updated directory structure and wipe scriptwq