Directory Structure changges