Made app runnable after restructure
working on rearchitechture