Restructure and changed version requirements.