directory sturcture now changed