Restructured and added release