Continue the work
Rename some file, update many function and add some things