fixed most links and changed structure