change folder structure to easily deploy
Fixed data binding problem