Add hispid3
Solve merge conflict
Restructure directory