Restructured and updated

For final release