New files and small edit

Removed code related to old prototype.