Modify Encode
Merge branch 'register' into develop
Sorting files into different folders
modify path