Restuctured directories and files to make app more modular and easy to m...

...aintain