[structure change] changing for a better structure