Removes unnecessary folders and update latest code from Zagreb.