Restructure and final changes