rename main folder to fix some bugs
Update addressing