Shop/Upgrade refactory

More simple structure, array based and more granular