restuctured the directory tree