Change package structure, Add new Triangle tests