Restructed the entire package with directories