massive amounts of changes, reorging the whole project