refacotring directory structure