Sorted thing into packages + added Ziv' stuff

Not everything works yet but there is a viable demo of the system.