Updated directory structure to make the repo directly usable