big changes, redesign the directory structor, still have lots of works to do