re-structuring of app with some more configs