Rarrangement of the directory structure. More information to setup in README.md