file restructure and cleanup for windoiws mac is now broken